From 3993f49a0c0d0294b35232f1274d1f8480230b82 Mon Sep 17 00:00:00 2001 From: Christophe Varoqui Date: Fri, 15 Sep 2023 10:17:00 +0200 Subject: [PATCH] Remove yaml tags from struct and api.yaml --- core/actionrouter/action.go | 12 +- core/check/main.go | 12 +- core/client/request/request.go | 10 +- core/client/requester/h2/h2.go | 6 +- core/clientcontext/context.go | 28 +- core/cluster/cluster.go | 42 +-- core/cluster/config.go | 26 +- core/cluster/daemon.go | 28 +- core/cluster/daemon_listener.go | 42 +-- core/cluster/daemon_monitor.go | 2 +- core/cluster/daemon_scheduler.go | 16 +- core/cluster/node_stats_bundle.go | 58 ++--- core/clusterip/main.go | 8 +- core/collector/tag.go | 6 +- core/commands/daemon_join.go | 2 +- core/commands/daemon_stats.go | 8 +- core/commands/node_collector_tag_attach.go | 4 +- core/commands/node_collector_tag_create.go | 4 +- core/commands/node_collector_tag_detach.go | 4 +- core/commands/node_collector_tag_list.go | 6 +- core/commands/node_collector_tag_show.go | 12 +- core/commands/node_relay_status.go | 2 +- core/commands/object_collector_tag_attach.go | 4 +- core/commands/object_collector_tag_create.go | 4 +- core/commands/object_collector_tag_detach.go | 4 +- core/commands/object_collector_tag_list.go | 6 +- core/commands/object_collector_tag_show.go | 12 +- core/event/main.go | 16 +- core/hbtype/main.go | 16 +- core/instance/config.go | 54 ++-- core/instance/instance.go | 6 +- core/instance/monitor.go | 60 ++--- core/instance/states.go | 14 +- core/instance/status.go | 20 +- core/manifest/manifest.go | 2 +- core/network/route.go | 12 +- core/network/status.go | 20 +- core/node/config.go | 10 +- core/node/main.go | 14 +- core/node/monitor.go | 32 +-- core/node/os.go | 2 +- core/node/stats.go | 12 +- core/node/status.go | 36 +-- core/nodeaction/node.go | 6 +- core/object/node_register.go | 12 +- core/object/type_status.go | 40 +-- core/objectaction/object.go | 6 +- core/objectdevice/main.go | 10 +- core/omcrypto/main.go | 8 +- core/path/path.go | 6 +- core/pool/main.go | 28 +- core/resource/log.go | 4 +- core/resource/resource.go | 36 +-- core/schedule/main.go | 22 +- core/xconfig/validate.go | 12 +- daemon/api/api.yaml | 44 ---- daemon/api/codegen_server_gen.go | 254 +++++++++---------- daemon/api/codegen_type_gen.go | 50 ++-- util/devicedriver/main.go | 4 +- util/lvm2/lv.go | 2 +- util/lvm2/vg.go | 2 +- util/pubsub/main.go | 2 +- util/pubsub/msg.go | 20 +- 63 files changed, 608 insertions(+), 654 deletions(-) diff --git a/core/actionrouter/action.go b/core/actionrouter/action.go index c089afd22..c537ba335 100644 --- a/core/actionrouter/action.go +++ b/core/actionrouter/action.go @@ -135,12 +135,12 @@ type ( // Result is a predictible type of actions return value, for reflect. Result struct { - Nodename string `json:"nodename" yaml:"nodename"` - Path path.T `json:"path,omitempty" yaml:"path,omitempty` - Data interface{} `json:"data" yaml:"data"` - Error error `json:"error,omitempty" yaml:"error,omitempty"` - Panic interface{} `json:"panic,omitempty" yaml:"panic,omitempty"` - HumanRenderer func() string `json:"-" yaml:"-"` + Nodename string `json:"nodename"` + Path path.T `json:"path,omitempty"` + Data interface{} `json:"data"` + Error error `json:"error,omitempty"` + Panic interface{} `json:"panic,omitempty"` + HumanRenderer func() string `json:"-"` } // renderer is implemented by data type stored in ActionResults.Data. diff --git a/core/check/main.go b/core/check/main.go index 315164956..f79d7b584 100644 --- a/core/check/main.go +++ b/core/check/main.go @@ -22,12 +22,12 @@ type ( // Result is the structure eventually collected for aggregation. Result struct { - DriverGroup string `json:"type" yaml:"type"` - DriverName string `json:"driver" yaml:"driver"` - Path string `json:"path" yaml:"path"` - Instance string `json:"instance" yaml:"instance"` - Unit string `json:"unit" yaml:"unit"` - Value int64 `json:"value" yaml:"value"` + DriverGroup string `json:"type"` + DriverName string `json:"driver"` + Path string `json:"path"` + Instance string `json:"instance"` + Unit string `json:"unit"` + Value int64 `json:"value"` } header interface { diff --git a/core/client/request/request.go b/core/client/request/request.go index 7506526d6..0c8723e4a 100644 --- a/core/client/request/request.go +++ b/core/client/request/request.go @@ -8,11 +8,11 @@ import ( type ( // T is a api request abstracting the protocol differences T struct { - Method string `json:"method,omitempty" yaml:"method,omitempty"` - Action string `json:"action,omitempty" yaml:"action,omitempty"` - Node string `json:"node,omitempty" yaml:"node,omitempty"` - Options map[string]interface{} `json:"options,omitempty" yaml:"options,omitempty"` - Values url.Values `json:"query_args,omitempty" yaml:"query_args,omitempty"` + Method string `json:"method,omitempty"` + Action string `json:"action,omitempty"` + Node string `json:"node,omitempty"` + Options map[string]interface{} `json:"options,omitempty"` + Values url.Values `json:"query_args,omitempty"` } ) diff --git a/core/client/requester/h2/h2.go b/core/client/requester/h2/h2.go index 577bc9a5e..c4f90568c 100644 --- a/core/client/requester/h2/h2.go +++ b/core/client/requester/h2/h2.go @@ -24,9 +24,9 @@ type ( Certificate string Key string Username string - Password string `json:"-" yaml:"-"` - URL string `json:"url" yaml:"url"` - Bearer string `json:"-" yaml:"-"` + Password string `json:"-"` + URL string `json:"url"` + Bearer string `json:"-"` Timeout time.Duration InsecureSkipVerify bool RootCA string diff --git a/core/clientcontext/context.go b/core/clientcontext/context.go index 4946f487f..21b701f2e 100644 --- a/core/clientcontext/context.go +++ b/core/clientcontext/context.go @@ -17,38 +17,38 @@ type ( // It contains the credentials and endpoint information to connect to // remote clusters. config struct { - Contexts map[string]relation `json:"contexts" yaml:"contexts"` - Clusters map[string]cluster `json:"clusters" yaml:"clusters"` - Users map[string]user `json:"users" yaml:"users"` + Contexts map[string]relation `json:"contexts"` + Clusters map[string]cluster `json:"clusters"` + Users map[string]user `json:"users"` } // T is a dereferenced Cluster-User relation. T struct { - Cluster cluster `json:"cluster" yaml:"cluster"` - User user `json:"user" yaml:"user"` - Namespace string `json:"namespace" yaml:"namespace"` + Cluster cluster `json:"cluster"` + User user `json:"user"` + Namespace string `json:"namespace"` } // relation is a Cluster-User relation. relation struct { - ClusterRefName string `json:"cluster" yaml:"cluster"` - UserRefName string `json:"user" yaml:"user"` - Namespace string `json:"namespace" yaml:"namespace"` + ClusterRefName string `json:"cluster"` + UserRefName string `json:"user"` + Namespace string `json:"namespace"` } // cluster host the endpoint address or name, and the certificate authority // to trust. cluster struct { - CertificateAuthority string `json:"certificate_authority,omitempty" yaml:"certificate_authority,omitempty"` - Server string `json:"server" yaml:"server"` - InsecureSkipVerify bool `json:"insecure" yaml:"insecure"` + CertificateAuthority string `json:"certificate_authority,omitempty"` + Server string `json:"server"` + InsecureSkipVerify bool `json:"insecure"` } // user hosts the certificate and private to use to connect to the remote // cluster. user struct { - ClientCertificate string `json:"client_certificate" yaml:"client_certificate"` - ClientKey string `json:"client_key" yaml:"client_key"` + ClientCertificate string `json:"client_certificate"` + ClientKey string `json:"client_key"` } ) diff --git a/core/cluster/cluster.go b/core/cluster/cluster.go index 1efb121de..9e2a53cf6 100644 --- a/core/cluster/cluster.go +++ b/core/cluster/cluster.go @@ -13,47 +13,47 @@ import ( type ( // Data describes the full Cluster state. Data struct { - Cluster Cluster `json:"cluster" yaml:"cluster"` - Daemon Deamon `json:"daemon" yaml:"daemon"` + Cluster Cluster `json:"cluster"` + Daemon Deamon `json:"daemon"` } Cluster struct { - Config Config `json:"config" yaml:"config"` - Status Status `json:"status" yaml:"status"` - Object map[string]object.Status `json:"object" yaml:"object"` + Config Config `json:"config"` + Status Status `json:"status"` + Object map[string]object.Status `json:"object"` - Node map[string]node.Node `json:"node" yaml:"node"` + Node map[string]node.Node `json:"node"` } Status struct { - IsCompat bool `json:"is_compat" yaml:"is_compat"` - IsFrozen bool `json:"is_frozen" yaml:"is_frozen"` + IsCompat bool `json:"is_compat"` + IsFrozen bool `json:"is_frozen"` } Deamon struct { - Collector DaemonCollector `json:"collector" yaml:"collector"` - DNS DaemonDNS `json:"dns" yaml:"dns"` - Hb DaemonHb `json:"hb" yaml:"hb"` - Listener DaemonListener `json:"listener" yaml:"listener"` - Monitor DaemonMonitor `json:"monitor" yaml:"monitor"` - Nodename string `json:"nodename" yaml:"nodename"` - Routines int `json:"routines" yaml:"routines"` - Scheduler DaemonScheduler `json:"scheduler" yaml:"scheduler"` + Collector DaemonCollector `json:"collector"` + DNS DaemonDNS `json:"dns"` + Hb DaemonHb `json:"hb"` + Listener DaemonListener `json:"listener"` + Monitor DaemonMonitor `json:"monitor"` + Nodename string `json:"nodename"` + Routines int `json:"routines"` + Scheduler DaemonScheduler `json:"scheduler"` } DaemonHb struct { - Streams []HeartbeatStream `json:"streams" yaml:"streams"` - LastMessages []HbLastMessage `json:"last_messages" yaml:"last_messages"` + Streams []HeartbeatStream `json:"streams"` + LastMessages []HbLastMessage `json:"last_messages"` } HbLastMessage struct { - From string `json:"from" yaml:"from"` + From string `json:"from"` // PatchLength is the type of hb message except when Type is patch where it is the patch queue length - PatchLength int `json:"patch_length" yaml:"patch_length"` + PatchLength int `json:"patch_length"` // Type is the hb message type (unset/ping/full/patch) - Type string `json:"type" yaml:"type"` + Type string `json:"type"` } ) diff --git a/core/cluster/config.go b/core/cluster/config.go index 2ea51ea7d..3ca78a918 100644 --- a/core/cluster/config.go +++ b/core/cluster/config.go @@ -7,25 +7,25 @@ type ( // The cluster name is used as the right most part of cluster dns // names. Config struct { - ID string `json:"id" yaml:"id"` - Name string `json:"name" yaml:"name"` - Nodes Nodes `json:"nodes" yaml:"nodes"` - DNS []string `json:"dns" yaml:"dns"` - CASecPaths []string `json:"ca_sec_paths" yaml:"ca_sec_path"` - Listener ConfigListener `json:"listener" yaml:"listener"` - Quorum bool `json:"quorum" yaml:"quorum"` + ID string `json:"id"` + Name string `json:"name"` + Nodes Nodes `json:"nodes"` + DNS []string `json:"dns"` + CASecPaths []string `json:"ca_sec_paths"` + Listener ConfigListener `json:"listener"` + Quorum bool `json:"quorum"` // fields private, no exposed in daemon data // json nor events secret string } ConfigListener struct { - CRL string `json:"crl" yaml:"crl"` - Addr string `json:"addr" yaml:"addr"` - Port int `json:"port" yaml:"port"` - OpenIdWellKnown string `json:"openid_well_known" yaml:"openid_well_known"` - DNSSockGID string `json:"dns_sock_gid" yaml:"dns_sock_gid"` - DNSSockUID string `json:"dns_sock_uid" yaml:"dns_sock_uid"` + CRL string `json:"crl"` + Addr string `json:"addr"` + Port int `json:"port"` + OpenIdWellKnown string `json:"openid_well_known"` + DNSSockGID string `json:"dns_sock_gid"` + DNSSockUID string `json:"dns_sock_uid"` } ) diff --git a/core/cluster/daemon.go b/core/cluster/daemon.go index 9c17b62a3..161b30e5c 100644 --- a/core/cluster/daemon.go +++ b/core/cluster/daemon.go @@ -7,24 +7,24 @@ type ( // was last configured, when it was created, its current state and its // id. DaemonSubsystemStatus struct { - Id string `json:"id" yaml:"id"` - ConfiguredAt time.Time `json:"configured_at" yaml:"configured_at"` - CreatedAt time.Time `json:"created_at" yaml:"created_at"` - State string `json:"state" yaml:"state"` - Alerts []ThreadAlert `json:"alerts,omitempty" yaml:"alerts,omitempty"` + Id string `json:"id"` + ConfiguredAt time.Time `json:"configured_at"` + CreatedAt time.Time `json:"created_at"` + State string `json:"state"` + Alerts []ThreadAlert `json:"alerts,omitempty"` } // ThreadAlert describes a message with a severity. Embedded in DaemonSubsystemStatus ThreadAlert struct { - Message string `json:"message" yaml:"message"` - Severity string `json:"severity" yaml:"severity"` + Message string `json:"message"` + Severity string `json:"severity"` } // DaemonCollector describes the OpenSVC daemon collector thread, // which is responsible for communicating with the collector on behalf // of the cluster. Only one node runs a collector thread. DaemonCollector struct { - DaemonSubsystemStatus `yaml:",inline"` + DaemonSubsystemStatus } // DaemonDNS describes the OpenSVC daemon dns thread, which is @@ -32,25 +32,25 @@ type ( // zone is dynamically populated by ip address allocated for the // services (frontend and backend). DaemonDNS struct { - DaemonSubsystemStatus `yaml:",inline"` + DaemonSubsystemStatus } // HeartbeatStream describes one OpenSVC daemon heartbeat thread, // which is responsible for sending or receiving the node DataSet // changes to or from peer nodes. HeartbeatStream struct { - DaemonSubsystemStatus `yaml:",inline"` + DaemonSubsystemStatus // Type is the heartbeat type example: unicast, ... - Type string `json:"type" yaml:"type"` + Type string `json:"type"` - Peers map[string]HeartbeatPeerStatus `json:"peers" yaml:"peers"` + Peers map[string]HeartbeatPeerStatus `json:"peers"` } // HeartbeatPeerStatus describes the status of the communication // with a specific peer node. HeartbeatPeerStatus struct { - IsBeating bool `json:"is_beating" yaml:"is_beating"` - LastAt time.Time `json:"last_at" yaml:"last_at"` + IsBeating bool `json:"is_beating"` + LastAt time.Time `json:"last_at"` } ) diff --git a/core/cluster/daemon_listener.go b/core/cluster/daemon_listener.go index 30d48acb3..fd73be639 100644 --- a/core/cluster/daemon_listener.go +++ b/core/cluster/daemon_listener.go @@ -8,47 +8,47 @@ import ( type ( // ListenerThreadSession describes statistics of a session of the api listener. ListenerThreadSession struct { - Addr string `json:"addr" yaml:"addr"` - CreatedAt time.Time `json:"created_at" yaml:"created_at"` - Encrypted bool `json:"encrypted" yaml:"encrypted"` - Progress string `json:"progress" yaml:"progress"` - TID uint64 `json:"tid" yaml:"tid"` + Addr string `json:"addr"` + CreatedAt time.Time `json:"created_at"` + Encrypted bool `json:"encrypted"` + Progress string `json:"progress"` + TID uint64 `json:"tid"` } // ListenerThreadClient describes the statistics of all session of a single client the api listener. ListenerThreadClient struct { - Accepted uint64 `json:"accepted" yaml:"accepted"` - AuthValidated uint64 `json:"auth_validated" yaml:"auth_validated"` - RX uint64 `json:"rx" yaml:"rx"` - TX uint64 `json:"tx" yaml:"tx"` + Accepted uint64 `json:"accepted"` + AuthValidated uint64 `json:"auth_validated"` + RX uint64 `json:"rx"` + TX uint64 `json:"tx"` } // ListenerThreadSessions describes the sessions statistics of the api listener. ListenerThreadSessions struct { - Accepted uint64 `json:"accepted" yaml:"accepted"` - AuthValidated uint64 `json:"auth_validated" yaml:"auth_validated"` - RX uint64 `json:"rx" yaml:"rx"` - TX uint64 `json:"tx" yaml:"tx"` - Alive map[string]ListenerThreadSession `json:"alive" yaml:"alive"` - Clients map[string]ListenerThreadClient `json:"clients" yaml:"clients"` + Accepted uint64 `json:"accepted"` + AuthValidated uint64 `json:"auth_validated"` + RX uint64 `json:"rx"` + TX uint64 `json:"tx"` + Alive map[string]ListenerThreadSession `json:"alive"` + Clients map[string]ListenerThreadClient `json:"clients"` } // ListenerThreadStats describes the statistics of the api listener. ListenerThreadStats struct { - Sessions ListenerThreadSessions `json:"sessions" yaml:"sessions"` + Sessions ListenerThreadSessions `json:"sessions"` } // DaemonListener describes the OpenSVC daemon listener thread, // which is responsible for serving the API. DaemonListener struct { - DaemonSubsystemStatus `yaml:",inline"` - Config ListenerThreadStatusConfig `json:"config" yaml:"config"` - Stats ListenerThreadStats `json:"stats" yaml:"stats"` + DaemonSubsystemStatus + Config ListenerThreadStatusConfig `json:"config"` + Stats ListenerThreadStats `json:"stats"` } // ListenerThreadStatusConfig holds a summary of the listener configuration ListenerThreadStatusConfig struct { - Addr net.IP `json:"addr" yaml:"addr"` - Port int `json:"port" yaml:"port"` + Addr net.IP `json:"addr"` + Port int `json:"port"` } ) diff --git a/core/cluster/daemon_monitor.go b/core/cluster/daemon_monitor.go index 2c487e4fc..f05d532f0 100644 --- a/core/cluster/daemon_monitor.go +++ b/core/cluster/daemon_monitor.go @@ -6,6 +6,6 @@ type ( // which is responsible for the node DataSets aggregation and // decision-making. DaemonMonitor struct { - DaemonSubsystemStatus `yaml:",inline"` + DaemonSubsystemStatus } ) diff --git a/core/cluster/daemon_scheduler.go b/core/cluster/daemon_scheduler.go index 96474cd9f..1eeaea387 100644 --- a/core/cluster/daemon_scheduler.go +++ b/core/cluster/daemon_scheduler.go @@ -6,19 +6,19 @@ type ( // SchedulerThreadEntry describes a task queued for execution by the // opensvc scheduler thread. SchedulerThreadEntry struct { - Action string `json:"action" yaml:"action"` - Csum string `json:"csum" yaml:"csum"` - Path string `json:"path" yaml:"path"` - ExpireAt time.Time `json:"expire_at" yaml:"expire_at"` - QueuedAt time.Time `json:"queued_at" yaml:"queued_at"` - Rid string `json:"rid" yaml:"rid"` + Action string `json:"action"` + Csum string `json:"csum"` + Path string `json:"path"` + ExpireAt time.Time `json:"expire_at"` + QueuedAt time.Time `json:"queued_at"` + Rid string `json:"rid"` } // DaemonScheduler describes the OpenSVC daemon scheduler thread // state, which is responsible for executing node and objects scheduled // jobs. DaemonScheduler struct { - DaemonSubsystemStatus `yaml:",inline"` - Delayed []SchedulerThreadEntry `json:"delayed" yaml:"delayed"` + DaemonSubsystemStatus + Delayed []SchedulerThreadEntry `json:"delayed"` } ) diff --git a/core/cluster/node_stats_bundle.go b/core/cluster/node_stats_bundle.go index 29e2bc1b7..4b53c7f0f 100644 --- a/core/cluster/node_stats_bundle.go +++ b/core/cluster/node_stats_bundle.go @@ -13,59 +13,59 @@ type ( // NodeStatsBundle embeds all daemon threads and each objet system // resource usage metrics. NodeStatsBundle struct { - Time time.Time `json:"time" yaml:"time"` - Collector ThreadStats `json:"collector" yaml:"collector"` - Daemon ThreadStats `json:"daemon" yaml:"daemon"` - DNS ThreadStats `json:"dns" yaml:"dns"` - Scheduler ThreadStats `json:"scheduler" yaml:"scheduler"` - Listener ThreadStats `json:"listener" yaml:"listener"` - Monitor ThreadStats `json:"monitor" yaml:"monitor"` - Heartbeats map[string]ThreadStats `json:"-" yaml:"-"` - Objects map[string]ObjectStats `json:"objects" yaml:"objects"` + Time time.Time `json:"time"` + Collector ThreadStats `json:"collector"` + Daemon ThreadStats `json:"daemon"` + DNS ThreadStats `json:"dns"` + Scheduler ThreadStats `json:"scheduler"` + Listener ThreadStats `json:"listener"` + Monitor ThreadStats `json:"monitor"` + Heartbeats map[string]ThreadStats `json:"-"` + Objects map[string]ObjectStats `json:"objects"` } // ThreadStats holds a daemon thread system resource usage metrics ThreadStats struct { - CPU CPUStats `json:"cpu" yaml:"cpu"` - Mem MemStats `json:"mem" yaml:"mem"` - Procs uint64 `json:"procs" yaml:"procs"` - Threads uint64 `json:"threads" yaml:"threads"` + CPU CPUStats `json:"cpu"` + Mem MemStats `json:"mem"` + Procs uint64 `json:"procs"` + Threads uint64 `json:"threads"` } // CPUStats holds CPU resource usage metrics. CPUStats struct { - Time uint64 `json:"time" yaml:"time"` + Time uint64 `json:"time"` } // MemStats holds CPU resource usage metrics. MemStats struct { - Total uint64 `json:"total" yaml:"total"` + Total uint64 `json:"total"` } // BlkStats holds block devices resource usage metrics. BlkStats struct { - Read uint64 `json:"r" yaml:"r"` - ReadByte uint64 `json:"rb" yaml:"rb"` - Write uint64 `json:"w" yaml:"w"` - WriteByte uint64 `json:"wb" yaml:"wb"` + Read uint64 `json:"r"` + ReadByte uint64 `json:"rb"` + Write uint64 `json:"w"` + WriteByte uint64 `json:"wb"` } // NetStats holds network resource usage metrics. NetStats struct { - Read uint64 `json:"r" yaml:"r"` - ReadByte uint64 `json:"rb" yaml:"rb"` - Write uint64 `json:"w" yaml:"w"` - WriteByte uint64 `json:"wb" yaml:"wb"` + Read uint64 `json:"r"` + ReadByte uint64 `json:"rb"` + Write uint64 `json:"w"` + WriteByte uint64 `json:"wb"` } // ObjectStats holds an object (ie cgroup) system resource usage metrics ObjectStats struct { - Blk BlkStats `json:"blk" yaml:"blk"` - Net NetStats `json:"net" yaml:"net"` - Mem MemStats `json:"mem" yaml:"mem"` - CPU CPUStats `json:"cpu" yaml:"cpu"` - Tasks uint64 `json:"tasks" yaml:"tasks"` - CreatedAt time.Time `json:"created_at" yaml:"created_at"` + Blk BlkStats `json:"blk"` + Net NetStats `json:"net"` + Mem MemStats `json:"mem"` + CPU CPUStats `json:"cpu"` + Tasks uint64 `json:"tasks"` + CreatedAt time.Time `json:"created_at"` } ) diff --git a/core/clusterip/main.go b/core/clusterip/main.go index 533cc3d75..2c6662dc3 100644 --- a/core/clusterip/main.go +++ b/core/clusterip/main.go @@ -14,10 +14,10 @@ import ( type ( T struct { - IP net.IP `json:"ip" yaml:"ip"` - Node string `json:"node" yaml:"node"` - Path path.T `json:"path" yaml:"path"` - RID string `json:"rid" yaml:"rid"` + IP net.IP `json:"ip"` + Node string `json:"node"` + Path path.T `json:"path"` + RID string `json:"rid"` } L []T ) diff --git a/core/collector/tag.go b/core/collector/tag.go index f1e282286..cc8f45dc2 100644 --- a/core/collector/tag.go +++ b/core/collector/tag.go @@ -8,9 +8,9 @@ import ( type ( TagAttachmentList []TagAttachment TagAttachment struct { - TagName string `json:"tag_name" yaml:"tag_name"` - TagData string `json:"tag_data" yaml:"tag_data"` - TagAttachData string `json:"tag_attach_data" yaml:"tag_attach_data"` + TagName string `json:"tag_name"` + TagData string `json:"tag_data"` + TagAttachData string `json:"tag_attach_data"` } ) diff --git a/core/commands/daemon_join.go b/core/commands/daemon_join.go index 3d0620f9d..3e9e26822 100644 --- a/core/commands/daemon_join.go +++ b/core/commands/daemon_join.go @@ -143,7 +143,7 @@ func (t *CmdDaemonJoin) checkParams() error { func (t *CmdDaemonJoin) extractCaClaim() (ca []byte, err error) { type ( joinClaim struct { - Ca string `json:"ca" yaml:"ca"` + Ca string `json:"ca"` *jwt.StandardClaims } ) diff --git a/core/commands/daemon_stats.go b/core/commands/daemon_stats.go index a67ca9946..12066152e 100644 --- a/core/commands/daemon_stats.go +++ b/core/commands/daemon_stats.go @@ -52,12 +52,12 @@ func (t *CmdDaemonStats) Run() error { func parseDaemonStats(b []byte) (cluster.Stats, error) { type ( nodeData struct { - Status int `json:"status" yaml:"status"` - Data cluster.NodeStatsBundle `json:"data" yaml:"data"` + Status int `json:"status"` + Data cluster.NodeStatsBundle `json:"data"` } responseType struct { - Status int `json:"status" yaml:"status"` - Nodes map[string]nodeData `json:"nodes" yaml:"nodes"` + Status int `json:"status"` + Nodes map[string]nodeData `json:"nodes"` } ) var t responseType diff --git a/core/commands/node_collector_tag_attach.go b/core/commands/node_collector_tag_attach.go index 7258698be..bb66c4d3d 100644 --- a/core/commands/node_collector_tag_attach.go +++ b/core/commands/node_collector_tag_attach.go @@ -35,8 +35,8 @@ func (t *CmdNodeCollectorTagAttach) Run() error { options["tag_attach_data"] = *t.AttachData } type respType struct { - Ret int `json:"ret" yaml:"ret"` - Msg string `json:"msg" yaml:"msg"` + Ret int `json:"ret"` + Msg string `json:"msg"` } var resp respType if err := cli.CallFor(&resp, "collector_tag", options); err != nil { diff --git a/core/commands/node_collector_tag_create.go b/core/commands/node_collector_tag_create.go index 2177f0c84..d585a2f58 100644 --- a/core/commands/node_collector_tag_create.go +++ b/core/commands/node_collector_tag_create.go @@ -43,8 +43,8 @@ func (t *CmdNodeCollectorTagCreate) Run() error { options["tag_exclude"] = *t.Exclude } type respType struct { - Ret int `json:"ret" yaml:"ret"` - Msg string `json:"msg" yaml:"msg"` + Ret int `json:"ret"` + Msg string `json:"msg"` } var resp respType if err := cli.CallFor(&resp, "collector_create_tag", options); err != nil { diff --git a/core/commands/node_collector_tag_detach.go b/core/commands/node_collector_tag_detach.go index 95694854d..d0bfb0bfc 100644 --- a/core/commands/node_collector_tag_detach.go +++ b/core/commands/node_collector_tag_detach.go @@ -31,8 +31,8 @@ func (t *CmdNodeCollectorTagDetach) Run() error { options := make(map[string]string) options["tag_name"] = t.Name type respType struct { - Ret int `json:"ret" yaml:"ret"` - Msg string `json:"msg" yaml:"msg"` + Ret int `json:"ret"` + Msg string `json:"msg"` } var resp respType if err := cli.CallFor(&resp, "collector_untag", options); err != nil { diff --git a/core/commands/node_collector_tag_list.go b/core/commands/node_collector_tag_list.go index 0062e0665..c3d87a7fc 100644 --- a/core/commands/node_collector_tag_list.go +++ b/core/commands/node_collector_tag_list.go @@ -30,9 +30,9 @@ func (t *CmdNodeCollectorTagList) Run() error { options := make(map[string]any) //options["svcname"] = type respType struct { - Ret int `json:"ret" yaml:"ret"` - Msg string `json:"msg" yaml:"msg"` - Data []string `json:"data" yaml:"data"` + Ret int `json:"ret"` + Msg string `json:"msg"` + Data []string `json:"data"` } var resp respType if err := cli.CallFor(&resp, "collector_list_tags", options); err != nil { diff --git a/core/commands/node_collector_tag_show.go b/core/commands/node_collector_tag_show.go index 2492bd19a..57ecef3b1 100644 --- a/core/commands/node_collector_tag_show.go +++ b/core/commands/node_collector_tag_show.go @@ -32,14 +32,14 @@ func (t *CmdNodeCollectorTagShow) Run() error { options := make(map[string]any) //options["svcname"] = type respType struct { - Ret int `json:"ret" yaml:"ret"` - Msg string `json:"msg" yaml:"msg"` - Data []string `json:"data" yaml:"data"` + Ret int `json:"ret"` + Msg string `json:"msg"` + Data []string `json:"data"` } type respTypeFull struct { - Ret int `json:"ret" yaml:"ret"` - Msg string `json:"msg" yaml:"msg"` - Data collector.TagAttachmentList `json:"data" yaml:"data"` + Ret int `json:"ret"` + Msg string `json:"msg"` + Data collector.TagAttachmentList `json:"data"` } if t.Verbose { var resp respTypeFull diff --git a/core/commands/node_relay_status.go b/core/commands/node_relay_status.go index 037bde924..3945ed63e 100644 --- a/core/commands/node_relay_status.go +++ b/core/commands/node_relay_status.go @@ -25,7 +25,7 @@ type ( } relayMessage struct { api.RelayMessage - Relay string `json:"relay" yaml:"relay"` + Relay string `json:"relay"` } relayMessages []relayMessage ) diff --git a/core/commands/object_collector_tag_attach.go b/core/commands/object_collector_tag_attach.go index f3200e8c3..b49a3a1c5 100644 --- a/core/commands/object_collector_tag_attach.go +++ b/core/commands/object_collector_tag_attach.go @@ -41,8 +41,8 @@ func (t *CmdObjectCollectorTagAttach) Run(selector, kind string) error { options["tag_attach_data"] = *t.AttachData } type respType struct { - Ret int `json:"ret" yaml:"ret"` - Msg string `json:"msg" yaml:"msg"` + Ret int `json:"ret"` + Msg string `json:"msg"` } var resp respType if err := cli.CallFor(&resp, "collector_tag", options); err != nil { diff --git a/core/commands/object_collector_tag_create.go b/core/commands/object_collector_tag_create.go index 544989985..df1103002 100644 --- a/core/commands/object_collector_tag_create.go +++ b/core/commands/object_collector_tag_create.go @@ -49,8 +49,8 @@ func (t *CmdObjectCollectorTagCreate) Run(selector, kind string) error { options["tag_exclude"] = *t.Exclude } type respType struct { - Ret int `json:"ret" yaml:"ret"` - Msg string `json:"msg" yaml:"msg"` + Ret int `json:"ret"` + Msg string `json:"msg"` } var resp respType if err := cli.CallFor(&resp, "collector_create_tag", options); err != nil { diff --git a/core/commands/object_collector_tag_detach.go b/core/commands/object_collector_tag_detach.go index 0e02d3600..1349f83e8 100644 --- a/core/commands/object_collector_tag_detach.go +++ b/core/commands/object_collector_tag_detach.go @@ -37,8 +37,8 @@ func (t *CmdObjectCollectorTagDetach) Run(selector, kind string) error { options["svcname"] = p.String() options["tag_name"] = t.Name type respType struct { - Ret int `json:"ret" yaml:"ret"` - Msg string `json:"msg" yaml:"msg"` + Ret int `json:"ret"` + Msg string `json:"msg"` } var resp respType if err := cli.CallFor(&resp, "collector_untag", options); err != nil { diff --git a/core/commands/object_collector_tag_list.go b/core/commands/object_collector_tag_list.go index 6227decaf..c86cdc4cd 100644 --- a/core/commands/object_collector_tag_list.go +++ b/core/commands/object_collector_tag_list.go @@ -34,9 +34,9 @@ func (t *CmdObjectCollectorTagList) Run(selector, kind string) error { } options := make(map[string]any) type respType struct { - Ret int `json:"ret" yaml:"ret"` - Msg string `json:"msg" yaml:"msg"` - Data []string `json:"data" yaml:"data"` + Ret int `json:"ret"` + Msg string `json:"msg"` + Data []string `json:"data"` } var resp respType if err := cli.CallFor(&resp, "collector_list_tags", options); err != nil { diff --git a/core/commands/object_collector_tag_show.go b/core/commands/object_collector_tag_show.go index 8ac7540b9..42381fa74 100644 --- a/core/commands/object_collector_tag_show.go +++ b/core/commands/object_collector_tag_show.go @@ -37,14 +37,14 @@ func (t *CmdObjectCollectorTagShow) Run(selector, kind string) error { options := make(map[string]any) options["svcname"] = p.String() type respType struct { - Ret int `json:"ret" yaml:"ret"` - Msg string `json:"msg" yaml:"msg"` - Data []string `json:"data" yaml:"data"` + Ret int `json:"ret"` + Msg string `json:"msg"` + Data []string `json:"data"` } type respTypeFull struct { - Ret int `json:"ret" yaml:"ret"` - Msg string `json:"msg" yaml:"msg"` - Data collector.TagAttachmentList `json:"data" yaml:"data"` + Ret int `json:"ret"` + Msg string `json:"msg"` + Data collector.TagAttachmentList `json:"data"` } if t.Verbose { var resp respTypeFull diff --git a/core/event/main.go b/core/event/main.go index c1f025b37..b5a3f4d45 100644 --- a/core/event/main.go +++ b/core/event/main.go @@ -17,23 +17,23 @@ type ( // installing a full dataset with received full dataset // or // patching a full dataset with received patch events - Kind string `json:"kind" yaml:"kind"` + Kind string `json:"kind"` // ID is a unique event id - ID uint64 `json:"id" yaml:"id"` + ID uint64 `json:"id"` // At is the time the event was published - At time.Time `json:"at" yaml:"at"` + At time.Time `json:"at"` // Data is the free-format dataset of the event - Data json.RawMessage `json:"data" yaml:"data"` + Data json.RawMessage `json:"data"` } ConcreteEvent struct { - Kind string `json:"kind" yaml:"kind"` - ID uint64 `json:"id" yaml:"id"` - At time.Time `json:"at" yaml:"at"` - Data any `json:"data" yaml:"data"` + Kind string `json:"kind"` + ID uint64 `json:"id"` + At time.Time `json:"at"` + Data any `json:"data"` } Reader interface { diff --git a/core/hbtype/main.go b/core/hbtype/main.go index dcadb0301..8f6668b9f 100644 --- a/core/hbtype/main.go +++ b/core/hbtype/main.go @@ -11,14 +11,14 @@ import ( type ( // Msg struct holds all kinds of hb message Msg struct { - Kind string `json:"kind" yaml:"kind"` - Compat uint64 `json:"compat" yaml:"compat"` - Gen map[string]uint64 `json:"gen" yaml:"gen"` - UpdatedAt time.Time `json:"updated_at" yaml:"updated_at"` - Ping node.Monitor `json:"monitor,omitempty" yaml:"monitor,omitempty"` - Events map[string][]event.Event `json:"events,omitempty" yaml:"events,omitempty"` - NodeData node.Node `json:"node_data,omitempty" yaml:"node_data,omitempty"` - Nodename string `json:"nodename" yaml:"nodename"` + Kind string `json:"kind"` + Compat uint64 `json:"compat"` + Gen map[string]uint64 `json:"gen"` + UpdatedAt time.Time `json:"updated_at"` + Ping node.Monitor `json:"monitor,omitempty"` + Events map[string][]event.Event `json:"events,omitempty"` + NodeData node.Node `json:"node_data,omitempty"` + Nodename string `json:"nodename"` } // IdStopper diff --git a/core/instance/config.go b/core/instance/config.go index 7d643888a..85540d3d1 100644 --- a/core/instance/config.go +++ b/core/instance/config.go @@ -15,38 +15,38 @@ type ( // Config describes a configuration file content checksum, // timestamp of last change and the nodes it should be installed on. Config struct { - App string `json:"app,omitempty" yaml:"app,omitempty"` - Checksum string `json:"csum" yaml:"csum"` - Children []path.Relation `json:"children,omitempty" yaml:"children,omitempty"` - DRP bool `json:"drp,omitempty" yaml:"drp,omitempty"` - Env string `json:"env,omitempty" yaml:"env,omitempty"` - FlexMax int `json:"flex_max,omitempty" yaml:"flex_max,omitempty"` - FlexMin int `json:"flex_min,omitempty" yaml:"flex_min,omitempty"` - FlexTarget int `json:"flex_target,omitempty" yaml:"flex_target,omitempty"` - MonitorAction MonitorAction `json:"monitor_action,omitempty" yaml:"monitor_action,omitempty"` - PreMonitorAction string `json:"pre_monitor_action,omitempty" yaml:"pre_monitor_action,omitempty"` - Nodename string `json:"-" yaml:"-"` - Orchestrate string `json:"orchestrate" yaml:"orchestrate"` - Path path.T `json:"-" yaml:"-"` - Parents []path.Relation `json:"parents,omitempty" yaml:"parents,omitempty"` - PlacementPolicy placement.Policy `json:"placement_policy" yaml:"placement_policy"` - Priority priority.T `json:"priority,omitempty" yaml:"priority,omitempty"` - Resources ResourceConfigs `json:"resources" yaml:"resources"` - Scope []string `json:"scope" yaml:"scope"` - Subsets SubsetConfigs `json:"subsets" yaml:"subsets"` - Topology topology.T `json:"topology" yaml:"topology"` - UpdatedAt time.Time `json:"updated_at" yaml:"updated_at"` + App string `json:"app,omitempty"` + Checksum string `json:"csum"` + Children []path.Relation `json:"children,omitempty"` + DRP bool `json:"drp,omitempty"` + Env string `json:"env,omitempty"` + FlexMax int `json:"flex_max,omitempty"` + FlexMin int `json:"flex_min,omitempty"` + FlexTarget int `json:"flex_target,omitempty"` + MonitorAction MonitorAction `json:"monitor_action,omitempty"` + PreMonitorAction string `json:"pre_monitor_action,omitempty"` + Nodename string `json:"-"` + Orchestrate string `json:"orchestrate"` + Path path.T `json:"-"` + Parents []path.Relation `json:"parents,omitempty"` + PlacementPolicy placement.Policy `json:"placement_policy"` + Priority priority.T `json:"priority,omitempty"` + Resources ResourceConfigs `json:"resources"` + Scope []string `json:"scope"` + Subsets SubsetConfigs `json:"subsets"` + Topology topology.T `json:"topology"` + UpdatedAt time.Time `json:"updated_at"` } ResourceConfigs map[string]ResourceConfig ResourceConfig struct { - IsDisabled bool `json:"is_disabled" yaml:"is_disabled"` - IsMonitored bool `json:"is_monitored" yaml:"is_monitored"` - IsStandby bool `json:"is_standby" yaml:"is_standby"` - Restart int `json:"restart" yaml:"restart"` - RestartDelay *time.Duration `json:"restart_delay" yaml:"restart_delay"` + IsDisabled bool `json:"is_disabled"` + IsMonitored bool `json:"is_monitored"` + IsStandby bool `json:"is_standby"` + Restart int `json:"restart"` + RestartDelay *time.Duration `json:"restart_delay"` } SubsetConfig struct { - Parallel bool `json:"parallel,omitempty" yaml:"parallel,omitempty"` + Parallel bool `json:"parallel,omitempty"` } SubsetConfigs map[string]SubsetConfig ) diff --git a/core/instance/instance.go b/core/instance/instance.go index 90e80df86..f094ecaae 100644 --- a/core/instance/instance.go +++ b/core/instance/instance.go @@ -2,8 +2,8 @@ package instance type ( Instance struct { - Config *Config `json:"config" yaml:"config"` - Monitor *Monitor `json:"monitor" yaml:"monitor"` - Status *Status `json:"status" yaml:"status"` + Config *Config `json:"config"` + Monitor *Monitor `json:"monitor"` + Status *Status `json:"status"` } ) diff --git a/core/instance/monitor.go b/core/instance/monitor.go index 3dc9984a4..32b7ea577 100644 --- a/core/instance/monitor.go +++ b/core/instance/monitor.go @@ -17,41 +17,41 @@ import ( type ( // Monitor describes the in-daemon states of an instance Monitor struct { - GlobalExpect MonitorGlobalExpect `json:"global_expect" yaml:"global_expect"` - GlobalExpectUpdatedAt time.Time `json:"global_expect_updated_at" yaml:"global_expect_updated_at"` - GlobalExpectOptions any `json:"global_expect_options" yaml:"global_expect_options"` + GlobalExpect MonitorGlobalExpect `json:"global_expect"` + GlobalExpectUpdatedAt time.Time `json:"global_expect_updated_at"` + GlobalExpectOptions any `json:"global_expect_options"` // IsLeader flags the instance as the one where to provision as leader. // The provisioning leader is responsible for preparing the shared resources. // There can be only one leader, whatever the topology. - IsLeader bool `json:"is_leader" yaml:"is_leader"` + IsLeader bool `json:"is_leader"` // IsHALeader flags the instances to start automatically if orchestrate=ha // or when the admin posted a start orchestration. // There can be one leader on a failover object, or many leaders with a flex topology. - IsHALeader bool `json:"is_ha_leader" yaml:"is_ha_leader"` + IsHALeader bool `json:"is_ha_leader"` - LocalExpect MonitorLocalExpect `json:"local_expect" yaml:"local_expect"` - LocalExpectUpdatedAt time.Time `json:"local_expect_updated_at" yaml:"local_expect_updated_at"` + LocalExpect MonitorLocalExpect `json:"local_expect"` + LocalExpectUpdatedAt time.Time `json:"local_expect_updated_at"` // OrchestrationId is the accepted orchestration id that will be unset // when orchestration is reached on local node - OrchestrationId uuid.UUID `json:"orchestration_id" yaml:"orchestration_id"` + OrchestrationId uuid.UUID `json:"orchestration_id"` // OrchestrationIsDone is set by the orchestration when it decides the instance state has reached its target. // A orchestration is cleaned up when all instance monitors have OrchestrationIsDone set. - OrchestrationIsDone bool `json:"orchestration_is_done" yaml:"orchestration_is_done"` - - SessionId uuid.UUID `json:"session_id" yaml:"session_id"` - State MonitorState `json:"state" yaml:"state"` - StateUpdatedAt time.Time `json:"state_updated_at" yaml:"state_updated_at"` - MonitorActionExecutedAt time.Time `json:"monitor_action_executed_at" yaml:"monitor_action_executed_at"` - IsPreserved bool `json:"preserved" yaml:"preserved"` - Resources ResourceMonitors `json:"resources,omitempty" yaml:"resources,omitempty"` - UpdatedAt time.Time `json:"updated_at" yaml:"updated_at"` - - Parents map[string]status.T `json:"parents,omitempty" yaml:"parents,omitempty"` - Children map[string]status.T `json:"children,omitempty" yaml:"children,omitempty"` + OrchestrationIsDone bool `json:"orchestration_is_done"` + + SessionId uuid.UUID `json:"session_id"` + State MonitorState `json:"state"` + StateUpdatedAt time.Time `json:"state_updated_at"` + MonitorActionExecutedAt time.Time `json:"monitor_action_executed_at"` + IsPreserved bool `json:"preserved"` + Resources ResourceMonitors `json:"resources,omitempty"` + UpdatedAt time.Time `json:"updated_at"` + + Parents map[string]status.T `json:"parents,omitempty"` + Children map[string]status.T `json:"children,omitempty"` } ResourceMonitors map[string]ResourceMonitor @@ -60,24 +60,24 @@ type ( // change some Monitor values. A nil value does not change the // current value. MonitorUpdate struct { - GlobalExpect *MonitorGlobalExpect `json:"global_expect" yaml:"global_expect"` - GlobalExpectOptions any `json:"global_expect_options" yaml:"global_expect_options"` - LocalExpect *MonitorLocalExpect `json:"local_expect" yaml:"local_expect"` - State *MonitorState `json:"state" yaml:"state"` + GlobalExpect *MonitorGlobalExpect `json:"global_expect"` + GlobalExpectOptions any `json:"global_expect_options"` + LocalExpect *MonitorLocalExpect `json:"local_expect"` + State *MonitorState `json:"state"` // CandidateOrchestrationId is a candidate orchestration id for a new imon orchestration. - CandidateOrchestrationId uuid.UUID `json:"orchestration_id" yaml:"orchestration_id"` + CandidateOrchestrationId uuid.UUID `json:"orchestration_id"` } // ResourceMonitor describes the restart states maintained by the daemon // for an object instance. ResourceMonitor struct { - Restart ResourceMonitorRestart `json:"restart" yaml:"restart"` + Restart ResourceMonitorRestart `json:"restart"` } ResourceMonitorRestart struct { - Remaining int `json:"remaining" yaml:"remaining"` - LastAt time.Time `json:"last_at" yaml:"last_at"` - Timer *time.Timer `json:"-" yaml:"-"` + Remaining int `json:"remaining"` + LastAt time.Time `json:"last_at"` + Timer *time.Timer `json:"-"` } MonitorState int @@ -85,7 +85,7 @@ type ( MonitorGlobalExpect int MonitorGlobalExpectOptionsPlacedAt struct { - Destination []string `json:"destination" yaml:"destination"` + Destination []string `json:"destination"` } ) diff --git a/core/instance/states.go b/core/instance/states.go index ae12ea25d..397a46705 100644 --- a/core/instance/states.go +++ b/core/instance/states.go @@ -11,17 +11,17 @@ type ( // States groups config and status of the object instance as seen by the daemon. States struct { - Path path.T `json:"path" yaml:"path"` - Node Node `json:"node,omitempty" yaml:"node,omitempty"` - Config Config `json:"config,omitempty" yaml:"config,omitempty"` - Status Status `json:"status,omitempty" yaml:"status,omitempty"` - Monitor Monitor `json:"monitor,omitempty" yaml:"monitor,omitempty"` + Path path.T `json:"path"` + Node Node `json:"node,omitempty"` + Config Config `json:"config,omitempty"` + Status Status `json:"status,omitempty"` + Monitor Monitor `json:"monitor,omitempty"` } // Node contains the node information displayed in print status. Node struct { - Name string `json:"name" yaml:"name"` - FrozenAt time.Time `json:"frozen_at,omitempty" yaml:"frozen_at,omitempty"` + Name string `json:"name"` + FrozenAt time.Time `json:"frozen_at,omitempty"` } ) diff --git a/core/instance/status.go b/core/instance/status.go index 1ce2d21e8..ae0394ce1 100644 --- a/core/instance/status.go +++ b/core/instance/status.go @@ -15,16 +15,16 @@ type ( // Status describes the instance status. Status struct { - Avail status.T `json:"avail" yaml:"avail"` - Constraints bool `json:"constraints,omitempty" yaml:"constraints,omitempty"` - FrozenAt time.Time `json:"frozen_at,omitempty" yaml:"frozen_at,omitempty"` - LastStartedAt time.Time `json:"last_started_at" yaml:"last_started_at"` - Optional status.T `json:"optional,omitempty" yaml:"optional,omitempty"` - Overall status.T `json:"overall" yaml:"overall"` - Provisioned provisioned.T `json:"provisioned" yaml:"provisioned"` - Resources ResourceStatuses `json:"resources,omitempty" yaml:"resources,omitempty"` - Running ResourceRunningSet `json:"running,omitempty" yaml:"running,omitempty"` - UpdatedAt time.Time `json:"updated_at" yaml:"updated_at"` + Avail status.T `json:"avail"` + Constraints bool `json:"constraints,omitempty"` + FrozenAt time.Time `json:"frozen_at,omitempty"` + LastStartedAt time.Time `json:"last_started_at"` + Optional status.T `json:"optional,omitempty"` + Overall status.T `json:"overall"` + Provisioned provisioned.T `json:"provisioned"` + Resources ResourceStatuses `json:"resources,omitempty"` + Running ResourceRunningSet `json:"running,omitempty"` + UpdatedAt time.Time `json:"updated_at"` } ResourceStatuses map[string]resource.Status diff --git a/core/manifest/manifest.go b/core/manifest/manifest.go index d8c9a7788..674c637f4 100644 --- a/core/manifest/manifest.go +++ b/core/manifest/manifest.go @@ -16,7 +16,7 @@ type ( // m := New("fs", "flag").AddKeyword(kws...).AddContext(ctx...) // T struct { - DriverID driver.ID `json:"driver" yaml:"driver"` + DriverID driver.ID `json:"driver"` Attrs map[string]Attr } diff --git a/core/network/route.go b/core/network/route.go index 8193a8ded..be4ed7040 100644 --- a/core/network/route.go +++ b/core/network/route.go @@ -13,12 +13,12 @@ import ( type ( Route struct { - Nodename string `json:"node" yaml:"node"` - Dev string `json:"dev" yaml:"dev"` - Dst *net.IPNet `json:"dst" yaml:"dst"` - Src net.IP `json:"ip" yaml:"ip"` - Gateway net.IP `json:"gw" yaml:"gw"` - Table string `json:"table" yaml:"table"` + Nodename string `json:"node"` + Dev string `json:"dev"` + Dst *net.IPNet `json:"dst"` + Src net.IP `json:"ip"` + Gateway net.IP `json:"gw"` + Table string `json:"table"` } Routes []Route ) diff --git a/core/network/status.go b/core/network/status.go index 86e5ae004..ac3755006 100644 --- a/core/network/status.go +++ b/core/network/status.go @@ -8,19 +8,19 @@ import ( type ( Usage struct { - Free int `json:"free" yaml:"free"` - Used int `json:"used" yaml:"used"` - Size int `json:"size" yaml:"size"` - Pct float64 `json:"pct" yaml:"pct"` + Free int `json:"free"` + Used int `json:"used"` + Size int `json:"size"` + Pct float64 `json:"pct"` } Status struct { - Name string `json:"name" yaml:"name"` - Type string `json:"type" yaml:"type"` - Network string `json:"network" yaml:"network"` - IPs clusterip.L `json:"ips" yaml:"ips"` - Errors []string `json:"errors,omitempty" yaml:"errors,omitempty"` - Usage Usage `json:"usage" yaml:"usage"` + Name string `json:"name"` + Type string `json:"type"` + Network string `json:"network"` + IPs clusterip.L `json:"ips"` + Errors []string `json:"errors,omitempty"` + Usage Usage `json:"usage"` } StatusList []Status ) diff --git a/core/node/config.go b/core/node/config.go index 9225f525f..4f0605a43 100644 --- a/core/node/config.go +++ b/core/node/config.go @@ -4,11 +4,11 @@ import "time" type ( Config struct { - Env string `json:"env" yaml:"env"` - MaintenanceGracePeriod time.Duration `json:"maintenance_grace_period" yaml:"maintenance_grace_period"` - ReadyPeriod time.Duration `json:"ready_period" yaml:"ready_period"` - RejoinGracePeriod time.Duration `json:"rejoin_grace_period" yaml:"rejoin_grace_period"` - SplitAction string `json:"split_action" yaml:"split_action"` + Env string `json:"env"` + MaintenanceGracePeriod time.Duration `json:"maintenance_grace_period"` + ReadyPeriod time.Duration `json:"ready_period"` + RejoinGracePeriod time.Duration `json:"rejoin_grace_period"` + SplitAction string `json:"split_action"` } ) diff --git a/core/node/main.go b/core/node/main.go index 6c5de118e..f4c670b30 100644 --- a/core/node/main.go +++ b/core/node/main.go @@ -9,13 +9,13 @@ import ( type ( // Node holds a node DataSet. Node struct { - Instance map[string]instance.Instance `json:"instance" yaml:"instance"` - Monitor Monitor `json:"monitor" yaml:"monitor"` - Stats Stats `json:"stats" yaml:"stats"` - Status Status `json:"status" yaml:"status"` - Os Os `json:"os" yaml:"os"` - Config Config `json:"config" yaml:"config"` - //Locks map[string]Lock `json:"locks" yaml:"locks"` + Instance map[string]instance.Instance `json:"instance"` + Monitor Monitor `json:"monitor"` + Stats Stats `json:"stats"` + Status Status `json:"status"` + Os Os `json:"os"` + Config Config `json:"config"` + //Locks map[string]Lock `json:"locks"` } ) diff --git a/core/node/monitor.go b/core/node/monitor.go index f4b0508b8..066874015 100644 --- a/core/node/monitor.go +++ b/core/node/monitor.go @@ -12,30 +12,30 @@ import ( type ( // Monitor describes the in-daemon states of a node Monitor struct { - GlobalExpect MonitorGlobalExpect `json:"global_expect" yaml:"global_expect"` - LocalExpect MonitorLocalExpect `json:"local_expect" yaml:"local_expect"` - State MonitorState `json:"state" yaml:"state"` - - GlobalExpectUpdatedAt time.Time `json:"global_expect_updated_at" yaml:"global_expect_updated_at"` - LocalExpectUpdatedAt time.Time `json:"local_expect_updated_at" yaml:"local_expect_updated_at"` - StateUpdatedAt time.Time `json:"state_updated_at" yaml:"state_updated_at"` - UpdatedAt time.Time `json:"updated_at" yaml:"updated_at"` - - OrchestrationId uuid.UUID `json:"orchestration_id" yaml:"orchestration_id"` - OrchestrationIsDone bool `json:"orchestration_is_done" yaml:"orchestration_is_done"` - SessionId uuid.UUID `json:"session_id" yaml:"session_id"` + GlobalExpect MonitorGlobalExpect `json:"global_expect"` + LocalExpect MonitorLocalExpect `json:"local_expect"` + State MonitorState `json:"state"` + + GlobalExpectUpdatedAt time.Time `json:"global_expect_updated_at"` + LocalExpectUpdatedAt time.Time `json:"local_expect_updated_at"` + StateUpdatedAt time.Time `json:"state_updated_at"` + UpdatedAt time.Time `json:"updated_at"` + + OrchestrationId uuid.UUID `json:"orchestration_id"` + OrchestrationIsDone bool `json:"orchestration_is_done"` + SessionId uuid.UUID `json:"session_id"` } // MonitorUpdate is embedded in the SetNodeMonitor message to // change some Monitor values. A nil value does not change the // current value. MonitorUpdate struct { - State *MonitorState `json:"state" yaml:"state"` - LocalExpect *MonitorLocalExpect `json:"local_expect" yaml:"local_expect"` - GlobalExpect *MonitorGlobalExpect `json:"global_expect" yaml:"global_expect"` + State *MonitorState `json:"state"` + LocalExpect *MonitorLocalExpect `json:"local_expect"` + GlobalExpect *MonitorGlobalExpect `json:"global_expect"` // CandidateOrchestrationId is a candidate orchestration id for a new imon orchestration. - CandidateOrchestrationId uuid.UUID `json:"orchestration_id" yaml:"orchestration_id"` + CandidateOrchestrationId uuid.UUID `json:"orchestration_id"` } MonitorState int diff --git a/core/node/os.go b/core/node/os.go index df4614ff5..62c6e6e05 100644 --- a/core/node/os.go +++ b/core/node/os.go @@ -5,6 +5,6 @@ import "github.com/opensvc/om3/util/san" type ( // Os defines Os details Os struct { - Paths san.Paths `json:"paths" yaml:"paths"` + Paths san.Paths `json:"paths"` } ) diff --git a/core/node/stats.go b/core/node/stats.go index 780503a87..36fa992ff 100644 --- a/core/node/stats.go +++ b/core/node/stats.go @@ -4,12 +4,12 @@ type ( // Stats describes systems (cpu, mem, swap) resource usage of a node // and an opensvc-specific score. Stats struct { - Load15M float64 `json:"load_15m" yaml:"load_15m"` - MemAvailPct uint64 `json:"mem_avail" yaml:"mem_avail"` - MemTotalMB uint64 `json:"mem_total" yaml:"mem_total"` - Score uint64 `json:"score" yaml:"score"` - SwapAvailPct uint64 `json:"swap_avail" yaml:"swap_avail"` - SwapTotalMB uint64 `json:"swap_total" yaml:"swap_total"` + Load15M float64 `json:"load_15m"` + MemAvailPct uint64 `json:"mem_avail"` + MemTotalMB uint64 `json:"mem_total"` + Score uint64 `json:"score"` + SwapAvailPct uint64 `json:"swap_avail"` + SwapTotalMB uint64 `json:"swap_total"` } ) diff --git a/core/node/status.go b/core/node/status.go index 8d4c778bb..ae66dccc0 100644 --- a/core/node/status.go +++ b/core/node/status.go @@ -10,30 +10,30 @@ import ( type ( Status struct { - Agent string `json:"agent" yaml:"agent"` - API uint64 `json:"api" yaml:"api"` - Arbitrators map[string]ArbitratorStatus `json:"arbitrators" yaml:"arbitrators"` - Compat uint64 `json:"compat" yaml:"compat"` - FrozenAt time.Time `json:"frozen_at" yaml:"frozen_at"` - Gen map[string]uint64 `json:"gen" yaml:"gen"` - MinAvailMemPct uint64 `json:"min_avail_mem" yaml:"min_avail_mem"` - MinAvailSwapPct uint64 `json:"min_avail_swap" yaml:"min_avail_swap"` - IsSpeaker bool `json:"is_speaker" yaml:"is_speaker"` - Labels Labels `json:"labels" yaml:"labels"` + Agent string `json:"agent"` + API uint64 `json:"api"` + Arbitrators map[string]ArbitratorStatus `json:"arbitrators"` + Compat uint64 `json:"compat"` + FrozenAt time.Time `json:"frozen_at"` + Gen map[string]uint64 `json:"gen"` + MinAvailMemPct uint64 `json:"min_avail_mem"` + MinAvailSwapPct uint64 `json:"min_avail_swap"` + IsSpeaker bool `json:"is_speaker"` + Labels Labels `json:"labels"` } // Instances groups instances configuration digest and status Instances struct { - Config map[string]instance.Config `json:"config" yaml:"config"` - Status map[string]instance.Status `json:"status" yaml:"status"` - Monitor map[string]instance.Monitor `json:"monitor" yaml:"monitor"` + Config map[string]instance.Config `json:"config"` + Status map[string]instance.Status `json:"status"` + Monitor map[string]instance.Monitor `json:"monitor"` } // ArbitratorStatus describes the internet name of an arbitrator and // if it is join-able. ArbitratorStatus struct { - Url string `json:"url" yaml:"url"` - Status status.T `json:"status" yaml:"status"` + Url string `json:"url"` + Status status.T `json:"status"` } // NodesInfo is the dataset exposed via the GET /nodes_info handler, @@ -43,9 +43,9 @@ type ( NodesInfo map[string]NodeInfo NodeInfo struct { - Env string `json:"env" yaml:"env"` - Labels Labels `json:"labels" yaml:"labels"` - Paths san.Paths `json:"paths" yaml:"paths"` + Env string `json:"env"` + Labels Labels `json:"labels"` + Paths san.Paths `json:"paths"` } ) diff --git a/core/nodeaction/node.go b/core/nodeaction/node.go index 44f745521..ce44fe47f 100644 --- a/core/nodeaction/node.go +++ b/core/nodeaction/node.go @@ -362,9 +362,9 @@ func (t T) DoRemote() error { return err } data := &struct { - Err string `json:"err" yaml:"err"` - Out string `json:"out" yaml:"out"` - Status int `json:"status" yaml:"status"` + Err string `json:"err"` + Out string `json:"out"` + Status int `json:"status"` }{} if err := json.Unmarshal(b, data); err != nil { return err diff --git a/core/object/node_register.go b/core/object/node_register.go index f4cd4e95b..9410c41e0 100644 --- a/core/object/node_register.go +++ b/core/object/node_register.go @@ -18,18 +18,18 @@ import ( type ( // registerReq structures the POST /register request body registerReq struct { - Nodename string `json:"nodename" yaml:"nodename"` - App string `json:"app,omitempty" yaml:"app,omitempty"` + Nodename string `json:"nodename"` + App string `json:"app,omitempty"` } // registerRes structures the POST /register response body registerRes struct { - Data registerResData `json:"data" yaml:"data"` - Info string `json:"info" yaml:"info"` - Error string `json:"error" yaml:"error"` + Data registerResData `json:"data"` + Info string `json:"info"` + Error string `json:"error"` } registerResData struct { - UUID string `json:"uuid" yaml:"uuid"` + UUID string `json:"uuid"` } ) diff --git a/core/object/type_status.go b/core/object/type_status.go index 811c1984e..9475c5057 100644 --- a/core/object/type_status.go +++ b/core/object/type_status.go @@ -23,31 +23,31 @@ type ( // Digest is a composite extract of different parts of // the cluster status. Digest struct { - IsCompat bool `json:"is_compat" yaml:"is_compat"` - Instances instance.StatesList `json:"instances" yaml:"instances"` - Object Status `json:"object" yaml:"object"` - Path path.T `json:"path" yaml:"path"` + IsCompat bool `json:"is_compat"` + Instances instance.StatesList `json:"instances"` + Object Status `json:"object"` + Path path.T `json:"path"` } // Status contains the object states obtained via // aggregation of all instances states. It exists when an instance config exists somewhere Status struct { - Avail status.T `json:"avail" yaml:"avail"` - FlexTarget int `json:"flex_target,omitempty" yaml:"flex_target,omitempty"` - FlexMin int `json:"flex_min,omitempty" yaml:"flex_min,omitempty"` - FlexMax int `json:"flex_max,omitempty" yaml:"flex_max,omitempty"` - Frozen string `json:"frozen" yaml:"frozen"` - Orchestrate string `json:"orchestrate" yaml:"orchestrate"` - Overall status.T `json:"overall" yaml:"overall"` - PlacementPolicy placement.Policy `json:"placement_policy" yaml:"placement_policy"` - PlacementState placement.State `json:"placement_state" yaml:"placement_state"` - Priority priority.T `json:"priority" yaml:"priority"` - Provisioned provisioned.T `json:"provisioned" yaml:"provisioned"` - Scope []string `json:"scope" yaml:"scope"` - Topology topology.T `json:"topology" yaml:"topology"` - UpInstancesCount int `json:"up_instances_count" yaml:"up_instances_count"` - - UpdatedAt time.Time `json:"updated_at" yaml:"updated_at"` + Avail status.T `json:"avail"` + FlexTarget int `json:"flex_target,omitempty"` + FlexMin int `json:"flex_min,omitempty"` + FlexMax int `json:"flex_max,omitempty"` + Frozen string `json:"frozen"` + Orchestrate string `json:"orchestrate"` + Overall status.T `json:"overall"` + PlacementPolicy placement.Policy `json:"placement_policy"` + PlacementState placement.State `json:"placement_state"` + Priority priority.T `json:"priority"` + Provisioned provisioned.T `json:"provisioned"` + Scope []string `json:"scope"` + Topology topology.T `json:"topology"` + UpInstancesCount int `json:"up_instances_count"` + + UpdatedAt time.Time `json:"updated_at"` } ) diff --git a/core/objectaction/object.go b/core/objectaction/object.go index 74c95f091..29c5b2488 100644 --- a/core/objectaction/object.go +++ b/core/objectaction/object.go @@ -375,9 +375,9 @@ func (t T) DoAsync() error { } type ( result struct { - Path string `json:"path" yaml:"path"` - OrchestrationId uuid.UUID `json:"orchestration_id,omitempty" yaml:"orchestration_id,omitempty"` - Error error `json:"error,omitempty" yaml:"error,omitempty"` + Path string `json:"path"` + OrchestrationId uuid.UUID `json:"orchestration_id,omitempty"` + Error error `json:"error,omitempty"` } results []result ) diff --git a/core/objectdevice/main.go b/core/objectdevice/main.go index 33950e744..e2764d92a 100644 --- a/core/objectdevice/main.go +++ b/core/objectdevice/main.go @@ -12,11 +12,11 @@ import ( type ( T struct { - Device device.T `json:"device" yaml:"device"` - Role Role `json:"role" yaml:"role"` - RID string `json:"rid" yaml:"rid"` - DriverID driver.ID `json:"driver" yaml:"driver"` - ObjectPath path.T `json:"path" yaml:"path"` + Device device.T `json:"device"` + Role Role `json:"role"` + RID string `json:"rid"` + DriverID driver.ID `json:"driver"` + ObjectPath path.T `json:"path"` } L []T Role int diff --git a/core/omcrypto/main.go b/core/omcrypto/main.go index 63cd5dfe6..8b1309fc1 100644 --- a/core/omcrypto/main.go +++ b/core/omcrypto/main.go @@ -25,10 +25,10 @@ type ( } encryptedMessage struct { - ClusterName string `json:"clustername" yaml:"clustername"` - NodeName string `json:"nodename" yaml:"nodename"` - IV string `json:"iv" yaml:"iv"` - Data string `json:"data" yaml:"data"` + ClusterName string `json:"clustername"` + NodeName string `json:"nodename"` + IV string `json:"iv"` + Data string `json:"data"` } ) diff --git a/core/path/path.go b/core/path/path.go index e26b1d523..368205ee4 100644 --- a/core/path/path.go +++ b/core/path/path.go @@ -40,9 +40,9 @@ type ( // Metadata is the parsed representation of a path, used by api handlers to ease dumb clients access to individual path fields. Metadata struct { - Name string `json:"name" yaml:"name"` - Namespace string `json:"namespace" yaml:"namespace"` - Kind kind.T `json:"kind" yaml:"kind"` + Name string `json:"name"` + Namespace string `json:"namespace"` + Kind kind.T `json:"kind"` } pather interface { diff --git a/core/pool/main.go b/core/pool/main.go index 723234ee5..64e597e72 100644 --- a/core/pool/main.go +++ b/core/pool/main.go @@ -29,30 +29,30 @@ type ( StatusUsage struct { // Free unit is KiB - Free float64 `json:"free" yaml:"free"` + Free float64 `json:"free"` // Used unit is KiB - Used float64 `json:"used" yaml:"used"` + Used float64 `json:"used"` // Size unit is KiB - Size float64 `json:"size" yaml:"size"` + Size float64 `json:"size"` } Status struct { - Type string `json:"type" yaml:"type"` - Name string `json:"name" yaml:"name"` - Capabilities []string `json:"capabilities" yaml:"capabilities"` - Head string `json:"head" yaml:"head"` - Errors []string `json:"errors" yaml:"errors"` - Volumes []VolumeStatus `json:"volumes" yaml:"volumes"` - StatusUsage `yaml:",inline"` + Type string `json:"type"` + Name string `json:"name"` + Capabilities []string `json:"capabilities"` + Head string `json:"head"` + Errors []string `json:"errors"` + Volumes []VolumeStatus `json:"volumes"` + StatusUsage } StatusList []Status Capabilities []string VolumeStatus struct { - Path path.T `json:"path" yaml:"path"` - Children []path.T `json:"children" yaml:"children"` - IsOrphan bool `json:"is_orphan" yaml:"is_orphan"` - Bytes float64 `json:"bytes" yaml:"bytes"` + Path path.T `json:"path"` + Children []path.T `json:"children"` + IsOrphan bool `json:"is_orphan"` + Bytes float64 `json:"bytes"` } VolumeStatusList []VolumeStatus diff --git a/core/resource/log.go b/core/resource/log.go index bfb2fa7ae..fe0e10536 100644 --- a/core/resource/log.go +++ b/core/resource/log.go @@ -17,8 +17,8 @@ type ( // StatusLogEntry is an element of LogType.Log StatusLogEntry struct { - Level Level `json:"level" yaml:"level"` - Message string `json:"message" yaml:"message"` + Level Level `json:"level"` + Message string `json:"message"` } ) diff --git a/core/resource/resource.go b/core/resource/resource.go index 4c277624f..c15c82408 100644 --- a/core/resource/resource.go +++ b/core/resource/resource.go @@ -172,8 +172,8 @@ type ( // ProvisionStatus define if and when the resource became provisioned. ProvisionStatus struct { - Mtime time.Time `json:"mtime,omitempty" yaml:"mtime,omitempty"` - State provisioned.T `json:"state" yaml:"state"` + Mtime time.Time `json:"mtime,omitempty"` + State provisioned.T `json:"state"` } // MonitorFlag tells the daemon if it should trigger a monitor action @@ -206,36 +206,36 @@ type ( // Status is the structure representing the resource status, // which is embedded in the instance status. Status struct { - ResourceID *resourceid.T `json:"-" yaml:"-"` - Label string `json:"label" yaml:"label"` - Log []*StatusLogEntry `json:"log,omitempty" yaml:"log,omitempty"` - Status status.T `json:"status" yaml:"status"` - Type string `json:"type" yaml:"type"` - Provisioned ProvisionStatus `json:"provisioned,omitempty" yaml:"provisioned,omitempty"` - Monitor MonitorFlag `json:"monitor,omitempty" yaml:"monitor,omitempty"` - Disable DisableFlag `json:"disable,omitempty" yaml:"disable,omitempty"` - Optional OptionalFlag `json:"optional,omitempty" yaml:"optional,omitempty"` - Encap EncapFlag `json:"encap,omitempty" yaml:"encap,omitempty"` - Standby StandbyFlag `json:"standby,omitempty" yaml:"standby,omitempty"` + ResourceID *resourceid.T `json:"-"` + Label string `json:"label"` + Log []*StatusLogEntry `json:"log,omitempty"` + Status status.T `json:"status"` + Type string `json:"type"` + Provisioned ProvisionStatus `json:"provisioned,omitempty"` + Monitor MonitorFlag `json:"monitor,omitempty"` + Disable DisableFlag `json:"disable,omitempty"` + Optional OptionalFlag `json:"optional,omitempty"` + Encap EncapFlag `json:"encap,omitempty"` + Standby StandbyFlag `json:"standby,omitempty"` // Subset is the name of the subset this resource is assigned to. - Subset string `json:"subset,omitempty" yaml:"subset,omitempty"` + Subset string `json:"subset,omitempty"` // Info is a list of key-value pairs providing interesting information to // collect site-wide about this resource. - Info map[string]any `json:"info,omitempty" yaml:"info,omitempty"` + Info map[string]any `json:"info,omitempty"` // Restart is the number of restart to be tried before giving up. - Restart RestartFlag `json:"restart,omitempty" yaml:"restart,omitempty"` + Restart RestartFlag `json:"restart,omitempty"` // Tags is a set of words attached to the resource. - Tags TagSet `json:"tags,omitempty" yaml:"tags,omitempty"` + Tags TagSet `json:"tags,omitempty"` } Hook int StatusInfoSchedAction struct { - Last time.Time `json:"last" yaml:"last"` + Last time.Time `json:"last"` } // ScheduleOptions contains the information needed by the object to create a diff --git a/core/schedule/main.go b/core/schedule/main.go index 884095409..24cf63f15 100644 --- a/core/schedule/main.go +++ b/core/schedule/main.go @@ -13,17 +13,17 @@ type ( Table []Entry Entry struct { - Action string `json:"action" yaml:"action"` - Definition string `json:"schedule_definition" yaml:"schedule_definition"` - Key string `json:"config_parameter" yaml:"config_parameter"` - LastRunAt time.Time `json:"last_run_at" yaml:"last_run_at"` - LastRunFile string `json:"last_run_file" yaml:"last_run_file"` - LastSuccessFile string `json:"last_success_file" yaml:"last_success_file"` - NextRunAt time.Time `json:"next_run_at" yaml:"next_run_at"` - Node string `json:"node" yaml:"node"` - Path path.T `json:"path" yaml:"path"` - RequireCollector bool `json:"require_collector" yaml:"require_collector"` - RequireProvisioned bool `json:"require_provisioned" yaml:"require_provisioned"` + Action string `json:"action"` + Definition string `json:"schedule_definition"` + Key string `json:"config_parameter"` + LastRunAt time.Time `json:"last_run_at"` + LastRunFile string `json:"last_run_file"` + LastSuccessFile string `json:"last_success_file"` + NextRunAt time.Time `json:"next_run_at"` + Node string `json:"node"` + Path path.T `json:"path"` + RequireCollector bool `json:"require_collector"` + RequireProvisioned bool `json:"require_provisioned"` } ) diff --git a/core/xconfig/validate.go b/core/xconfig/validate.go index 89107532d..120b48d12 100644 --- a/core/xconfig/validate.go +++ b/core/xconfig/validate.go @@ -18,12 +18,12 @@ import ( type ( ValidateAlerts []ValidateAlert ValidateAlert struct { - Path path.T `json:"path" yaml:"path"` - Level ValidateAlertLevel `json:"level" yaml:"level"` - Kind ValidateAlertKind `json:"kind" yaml:"kind"` - Key key.T `json:"key" yaml:"key"` - Driver driver.ID `json:"driver" yaml:"driver"` - Comment string `json:"comment" yaml:"comment"` + Path path.T `json:"path"` + Level ValidateAlertLevel `json:"level"` + Kind ValidateAlertKind `json:"kind"` + Key key.T `json:"key"` + Driver driver.ID `json:"driver"` + Comment string `json:"comment"` } ValidateAlertKind int ValidateAlertLevel int diff --git a/daemon/api/api.yaml b/daemon/api/api.yaml index 150b403d0..cecd5e4c8 100644 --- a/daemon/api/api.yaml +++ b/daemon/api/api.yaml @@ -1636,8 +1636,6 @@ components: - token properties: expired_at: - x-oapi-codegen-extra-tags: - yaml: expired_at type: string format: date-time token: @@ -1747,12 +1745,8 @@ components: - last_at properties: is_beating: - x-oapi-codegen-extra-tags: - yaml: is_beating type: boolean last_at: - x-oapi-codegen-extra-tags: - yaml: last_at type: string format: date-time DaemonListener: @@ -1791,8 +1785,6 @@ components: type: string format: date-time created_at: - x-oapi-codegen-extra-tags: - yaml: created_at type: string format: date-time id: @@ -1838,8 +1830,6 @@ components: minor: type: integer expired_at: - x-oapi-codegen-extra-tags: - yaml: expired_at type: string format: date-time InstanceMeta: @@ -2431,16 +2421,10 @@ components: avail: $ref: '#/components/schemas/Status' flex_max: - x-oapi-codegen-extra-tags: - yaml: flex_max type: integer flex_min: - x-oapi-codegen-extra-tags: - yaml: flex_min type: integer flex_target: - x-oapi-codegen-extra-tags: - yaml: flex_target type: integer frozen: type: string @@ -2467,12 +2451,8 @@ components: topology: $ref: '#/components/schemas/Topology' up_instances_count: - x-oapi-codegen-extra-tags: - yaml: up_instances_count type: integer updated_at: - x-oapi-codegen-extra-tags: - yaml: updated_at type: string Orchestrate: type: string @@ -2485,8 +2465,6 @@ components: type: object properties: orchestration_id: - x-oapi-codegen-extra-tags: - yaml: orchestration_id type: string format: uuid required: @@ -2560,8 +2538,6 @@ components: description: volume size in bytes type: number PlacementPolicy: - x-oapi-codegen-extra-tags: - yaml: placement_policy type: string default: none description: object placement policy @@ -2574,8 +2550,6 @@ components: - spread - shift PlacementState: - x-oapi-codegen-extra-tags: - yaml: placement_state type: string description: object placement state enum: @@ -2623,8 +2597,6 @@ components: - data properties: allocation_id: - x-oapi-codegen-extra-tags: - yaml: allocation_id type: string format: uuid data: @@ -2647,15 +2619,11 @@ components: path: type: string session_id: - x-oapi-codegen-extra-tags: - yaml: session_id type: string format: uuid state: type: string is_partial: - x-oapi-codegen-extra-tags: - yaml: is_partial type: boolean # ======================================================================== @@ -2766,12 +2734,8 @@ components: - nodename properties: cluster_id: - x-oapi-codegen-extra-tags: - yaml: cluster_id type: string cluster_name: - x-oapi-codegen-extra-tags: - yaml: cluster_name type: string nodename: type: string @@ -2822,20 +2786,14 @@ components: addr: type: string cluster_id: - x-oapi-codegen-extra-tags: - yaml: cluster_id type: string cluster_name: - x-oapi-codegen-extra-tags: - yaml: cluster_name type: string msg: type: string nodename: type: string updated_at: - x-oapi-codegen-extra-tags: - yaml: updated_at type: string format: date-time RelayMessageList: @@ -2987,8 +2945,6 @@ components: remaining: type: integer last_at: - x-oapi-codegen-extra-tags: - yaml: last_at type: string format: date-time ResourceStatus: diff --git a/daemon/api/codegen_server_gen.go b/daemon/api/codegen_server_gen.go index ed5c5143c..39c13319b 100644 --- a/daemon/api/codegen_server_gen.go +++ b/daemon/api/codegen_server_gen.go @@ -1500,134 +1500,132 @@ func RegisterHandlersWithBaseURL(router EchoRouter, si ServerInterface, baseURL // Base64 encoded, gzipped, json marshaled Swagger object var swaggerSpec = []string{ - "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", + "qKJQcto9Pz4/f/7/AAAA//8THVNDzPcAAA==", } // GetSwagger returns the content of the embedded swagger specification file diff --git a/daemon/api/codegen_type_gen.go b/daemon/api/codegen_type_gen.go index 1d321481c..ae15a5651 100644 --- a/daemon/api/codegen_type_gen.go +++ b/daemon/api/codegen_type_gen.go @@ -105,7 +105,7 @@ type ArbitratorStatus struct { // AuthToken defines model for AuthToken. type AuthToken struct { - ExpiredAt time.Time `json:"expired_at" yaml:"expired_at"` + ExpiredAt time.Time `json:"expired_at"` Token string `json:"token"` } @@ -143,7 +143,7 @@ type DNSZone = []DNSRecord // DRBDAllocation defines model for DRBDAllocation. type DRBDAllocation struct { - ExpiredAt time.Time `json:"expired_at" yaml:"expired_at"` + ExpiredAt time.Time `json:"expired_at"` Id openapi_types.UUID `json:"id"` Minor int `json:"minor"` Port int `json:"port"` @@ -193,10 +193,10 @@ type DaemonHbMode struct { type DaemonHbStream struct { Alerts []DaemonSubsystemAlert `json:"alerts"` Configured time.Time `json:"configured"` - CreatedAt time.Time `json:"created_at" yaml:"created_at"` + CreatedAt time.Time `json:"created_at"` Id string `json:"id"` - IsBeating bool `json:"is_beating" yaml:"is_beating"` - LastAt time.Time `json:"last_at" yaml:"last_at"` + IsBeating bool `json:"is_beating"` + LastAt time.Time `json:"last_at"` State string `json:"state"` // Type hb stream type @@ -205,8 +205,8 @@ type DaemonHbStream struct { // DaemonHbStreamPeer defines model for DaemonHbStreamPeer. type DaemonHbStreamPeer struct { - IsBeating bool `json:"is_beating" yaml:"is_beating"` - LastAt time.Time `json:"last_at" yaml:"last_at"` + IsBeating bool `json:"is_beating"` + LastAt time.Time `json:"last_at"` } // DaemonHbStreamType defines model for DaemonHbStreamType. @@ -240,7 +240,7 @@ type DaemonSubsystemAlert struct { type DaemonSubsystemStatus struct { Alerts []DaemonSubsystemAlert `json:"alerts"` Configured time.Time `json:"configured"` - CreatedAt time.Time `json:"created_at" yaml:"created_at"` + CreatedAt time.Time `json:"created_at"` Id string `json:"id"` State string `json:"state"` } @@ -441,19 +441,19 @@ type ObjectConfig struct { // ObjectData defines model for ObjectData. type ObjectData struct { Avail Status `json:"avail"` - FlexMax int `json:"flex_max" yaml:"flex_max"` - FlexMin int `json:"flex_min" yaml:"flex_min"` - FlexTarget int `json:"flex_target" yaml:"flex_target"` + FlexMax int `json:"flex_max"` + FlexMin int `json:"flex_min"` + FlexTarget int `json:"flex_target"` Frozen string `json:"frozen"` Instances map[string]Instance `json:"instances"` Orchestrate Orchestrate `json:"orchestrate"` Overall Status `json:"overall"` // PlacementPolicy object placement policy - PlacementPolicy PlacementPolicy `json:"placement_policy" yaml:"placement_policy"` + PlacementPolicy PlacementPolicy `json:"placement_policy"` // PlacementState object placement state - PlacementState PlacementState `json:"placement_state" yaml:"placement_state"` + PlacementState PlacementState `json:"placement_state"` Priority int `json:"priority"` // Provisioned service, instance or resource provisioned state @@ -462,8 +462,8 @@ type ObjectData struct { // Topology object topology Topology Topology `json:"topology"` - UpInstancesCount int `json:"up_instances_count" yaml:"up_instances_count"` - UpdatedAt string `json:"updated_at" yaml:"updated_at"` + UpInstancesCount int `json:"up_instances_count"` + UpdatedAt string `json:"updated_at"` } // ObjectFile defines model for ObjectFile. @@ -491,7 +491,7 @@ type Orchestrate string // OrchestrationQueued defines model for OrchestrationQueued. type OrchestrationQueued struct { - OrchestrationId openapi_types.UUID `json:"orchestration_id" yaml:"orchestration_id"` + OrchestrationId openapi_types.UUID `json:"orchestration_id"` } // PlacementPolicy object placement policy @@ -555,7 +555,7 @@ type PostDaemonSubActionAction string // PostNodeDRBDConfigRequest defines model for PostNodeDRBDConfigRequest. type PostNodeDRBDConfigRequest struct { - AllocationId openapi_types.UUID `json:"allocation_id" yaml:"allocation_id"` + AllocationId openapi_types.UUID `json:"allocation_id"` Data []byte `json:"data"` } @@ -577,16 +577,16 @@ type PostObjectClear struct { // PostObjectProgress defines model for PostObjectProgress. type PostObjectProgress struct { - IsPartial *bool `json:"is_partial,omitempty" yaml:"is_partial"` + IsPartial *bool `json:"is_partial,omitempty"` Path string `json:"path"` - SessionId openapi_types.UUID `json:"session_id" yaml:"session_id"` + SessionId openapi_types.UUID `json:"session_id"` State string `json:"state"` } // PostRelayMessage defines model for PostRelayMessage. type PostRelayMessage struct { - ClusterId string `json:"cluster_id" yaml:"cluster_id"` - ClusterName string `json:"cluster_name" yaml:"cluster_name"` + ClusterId string `json:"cluster_id"` + ClusterName string `json:"cluster_name"` Msg string `json:"msg"` Nodename string `json:"nodename"` } @@ -614,11 +614,11 @@ type Provisioned string // RelayMessage defines model for RelayMessage. type RelayMessage struct { Addr string `json:"addr"` - ClusterId string `json:"cluster_id" yaml:"cluster_id"` - ClusterName string `json:"cluster_name" yaml:"cluster_name"` + ClusterId string `json:"cluster_id"` + ClusterName string `json:"cluster_name"` Msg string `json:"msg"` Nodename string `json:"nodename"` - UpdatedAt time.Time `json:"updated_at" yaml:"updated_at"` + UpdatedAt time.Time `json:"updated_at"` } // RelayMessageList defines model for RelayMessageList. @@ -687,7 +687,7 @@ type ResourceMonitorItem struct { // ResourceMonitorRestart defines model for ResourceMonitorRestart. type ResourceMonitorRestart struct { - LastAt time.Time `json:"last_at" yaml:"last_at"` + LastAt time.Time `json:"last_at"` Remaining int `json:"remaining"` } diff --git a/util/devicedriver/main.go b/util/devicedriver/main.go index fc41e79a7..ee06227c9 100644 --- a/util/devicedriver/main.go +++ b/util/devicedriver/main.go @@ -23,10 +23,10 @@ type ( log *zerolog.Logger } Loop struct { - logT `yaml:",inline"` + logT } DeviceMapper struct { - logT `yaml:",inline"` + logT } ) diff --git a/util/lvm2/lv.go b/util/lvm2/lv.go index ec60787a5..0e55fc21e 100644 --- a/util/lvm2/lv.go +++ b/util/lvm2/lv.go @@ -34,7 +34,7 @@ type ( Devices string `json:"devices"` } LV struct { - driver `yaml:",inline"` + driver LVName string VGName string } diff --git a/util/lvm2/vg.go b/util/lvm2/vg.go index 3b94e5262..9b6e7cd96 100644 --- a/util/lvm2/vg.go +++ b/util/lvm2/vg.go @@ -21,7 +21,7 @@ import ( type ( VG struct { - driver `yaml:",inline"` + driver VGName string log *zerolog.Logger } diff --git a/util/pubsub/main.go b/util/pubsub/main.go index 72f925736..a06f9e8a2 100644 --- a/util/pubsub/main.go +++ b/util/pubsub/main.go @@ -168,7 +168,7 @@ type ( } Msg struct { - Labels Labels `json:"labels" yaml:"labels"` + Labels Labels `json:"labels"` } Messager interface { diff --git a/util/pubsub/msg.go b/util/pubsub/msg.go index 117e3e456..8a56cf59a 100644 --- a/util/pubsub/msg.go +++ b/util/pubsub/msg.go @@ -6,30 +6,30 @@ type ( // SubscriptionError is an emitted publication made when a subscriber notification // exceeds its timeout SubscriptionError struct { - Msg `yaml:",inline"` - Id uuid.UUID `json:"id" yaml:"id"` - Name string `json:"name" yaml:"name"` - ErrS string `json:"error" yaml:"error"` + Msg + Id uuid.UUID `json:"id"` + Name string `json:"name"` + ErrS string `json:"error"` } // SubscriptionQueueThreshold is an emitted publication made when a subscriber queue // reach/leave its current high threshold value SubscriptionQueueThreshold struct { - Msg `yaml:",inline"` + Msg Id uuid.UUID - Name string `json:"name" yaml:"name"` + Name string `json:"name"` // Count is the current used slots in internal subscriber queue - Count uint64 `json:"count" yaml:"count"` + Count uint64 `json:"count"` // From is the previous high threshold value - From uint64 `json:"from" yaml:"from"` + From uint64 `json:"from"` // To is the new high threshold value - To uint64 `json:"to" yaml:"to"` + To uint64 `json:"to"` // Limit is the maximum queue size - Limit uint64 `json:"limit" yaml:"limit"` + Limit uint64 `json:"limit"` } )