From e3f162cd56e6aae25a57ef4a89b53ec29e838b9c Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 11 Oct 2023 11:09:07 -0700 Subject: [PATCH] cloudapi: Move Services to an actual struct This removes the need to make anonymous structs in the middle of the Customizations request. --- internal/cloudapi/v2/compose_test.go | 14 +- internal/cloudapi/v2/openapi.v2.gen.go | 309 +++++++++++++------------ internal/cloudapi/v2/openapi.v2.yml | 36 +-- 3 files changed, 179 insertions(+), 180 deletions(-) diff --git a/internal/cloudapi/v2/compose_test.go b/internal/cloudapi/v2/compose_test.go index 4487d537d5..7f7bfe1f53 100644 --- a/internal/cloudapi/v2/compose_test.go +++ b/internal/cloudapi/v2/compose_test.go @@ -38,15 +38,6 @@ func TestGetBlueprintWithCustomizations(t *testing.T) { // interface{} is a terrible idea. Work around it... var rootStr interface{} = "root" - // anonymous structs buried in a data type are almost as bad. - services := struct { - Disabled *[]string `json:"disabled,omitempty"` - Enabled *[]string `json:"enabled,omitempty"` - }{ - Disabled: &[]string{"cleanup"}, - Enabled: &[]string{"sshd"}, - } - // Construct the compose request with customizations cr = ComposeRequest{Customizations: &Customizations{ Users: &[]User{ @@ -87,7 +78,10 @@ func TestGetBlueprintWithCustomizations(t *testing.T) { MinSize: 1099511627776, }, }, - Services: &services, + Services: &Services{ + Disabled: &[]string{"cleanup"}, + Enabled: &[]string{"sshd"}, + }, Openscap: &OpenSCAP{ProfileId: "B 263-59"}, CustomRepositories: &[]CustomRepository{ CustomRepository{ diff --git a/internal/cloudapi/v2/openapi.v2.gen.go b/internal/cloudapi/v2/openapi.v2.gen.go index d76523e6a4..1c339282e9 100644 --- a/internal/cloudapi/v2/openapi.v2.gen.go +++ b/internal/cloudapi/v2/openapi.v2.gen.go @@ -364,13 +364,7 @@ type Customizations struct { // any other part of the build process). The package_sets field for these // repositories is ignored. PayloadRepositories *[]Repository `json:"payload_repositories,omitempty"` - Services *struct { - // List of services to disable by default - Disabled *[]string `json:"disabled,omitempty"` - - // List of services to enable by default - Enabled *[]string `json:"enabled,omitempty"` - } `json:"services,omitempty"` + Services *Services `json:"services,omitempty"` // List of ssh keys Sshkey *[]SSHKey `json:"sshkey,omitempty"` @@ -709,6 +703,15 @@ type SSHKey struct { User string `json:"user"` } +// Services defines model for Services. +type Services struct { + // List of services to disable by default + Disabled *[]string `json:"disabled,omitempty"` + + // List of services to enable by default + Enabled *[]string `json:"enabled,omitempty"` +} + // Subscription defines model for Subscription. type Subscription struct { ActivationKey string `json:"activation_key"` @@ -1036,152 +1039,152 @@ func RegisterHandlersWithBaseURL(router EchoRouter, si ServerInterface, baseURL // Base64 encoded, gzipped, json marshaled Swagger object var swaggerSpec = []string{ - "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", - "hwm+iBdcvxsNsw7O1+//PwAA///a3fCCYpAAAA==", + "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", } // GetSwagger returns the content of the embedded swagger specification file diff --git a/internal/cloudapi/v2/openapi.v2.yml b/internal/cloudapi/v2/openapi.v2.yml index b1a5626e98..aff39aae53 100644 --- a/internal/cloudapi/v2/openapi.v2.yml +++ b/internal/cloudapi/v2/openapi.v2.yml @@ -1139,23 +1139,7 @@ components: items: $ref: '#/components/schemas/Filesystem' services: - type: object - additionalProperties: false - properties: - enabled: - description: List of services to enable by default - type: array - minItems: 1 - items: - type: string - example: "nftables" - disabled: - description: List of services to disable by default - type: array - minItems: 1 - items: - type: string - example: "firewalld" + $ref: '#/components/schemas/Services' hostname: type: string description: Configures the hostname @@ -1415,6 +1399,24 @@ components: description: Adds the key to the user's authorized_keys file example: | ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIASWitkOH4U874EdsBUnytb3bwvRggHlQlbYXl7n10v9 + Services: + type: object + additionalProperties: false + properties: + enabled: + description: List of services to enable by default + type: array + minItems: 1 + items: + type: string + example: "nftables" + disabled: + description: List of services to disable by default + type: array + minItems: 1 + items: + type: string + example: "firewalld" Timezone: type: object description: Timezone configuration