adjusted create and show to dbaas bump

exoscale · Sep 25, 2024 · a1dde71 · a1dde71
1 parent 946301c
commit a1dde71
Show file tree

Hide file tree

Showing 15 changed files with 263 additions and 109 deletions.
diff --git a/cmd/dbaas_external_endpoint_create_datadog.go b/cmd/dbaas_external_endpoint_create_datadog.go
@@ -26,8 +26,8 @@ func (c *dbaasExternalEndpointCreateCmd) createDatadog(_ *cobra.Command, _ []str
 		}
 	}
 
-	datadogRequestPayload := v3.DBAASEndpointDatadogPayload{
-		Settings: &v3.DBAASEndpointDatadogPayloadSettings{},
+	datadogRequestPayload := v3.DBAASEndpointDatadogInputCreate{
+		Settings: &v3.DBAASEndpointDatadogInputCreateSettings{},
 	}
 
 	if c.DatadogAPIKey != "" {

diff --git a/cmd/dbaas_external_endpoint_create_elasticsearch.go b/cmd/dbaas_external_endpoint_create_elasticsearch.go
@@ -15,8 +15,8 @@ func (c *dbaasExternalEndpointCreateCmd) createElasticsearch(_ *cobra.Command, _
 		return err
 	}
 
-	elasticsearchRequestPayload := v3.DBAASEndpointElasticsearchPayload{
-		Settings: &v3.DBAASEndpointElasticsearchPayloadSettings{},
+	elasticsearchRequestPayload := v3.DBAASEndpointElasticsearchInputCreate{
+		Settings: &v3.DBAASEndpointElasticsearchInputCreateSettings{},
 	}
 
 	if c.ElasticsearchURL != "" {

diff --git a/cmd/dbaas_external_endpoint_create_opensearch.go b/cmd/dbaas_external_endpoint_create_opensearch.go
@@ -15,8 +15,8 @@ func (c *dbaasExternalEndpointCreateCmd) createOpensearch(_ *cobra.Command, _ []
 		return err
 	}
 
-	opensearchRequestPayload := v3.DBAASEndpointOpensearchPayload{
-		Settings: &v3.DBAASEndpointOpensearchPayloadSettings{},
+	opensearchRequestPayload := v3.DBAASEndpointOpensearchInputCreate{
+		Settings: &v3.DBAASEndpointOpensearchInputCreateSettings{},
 	}
 
 	if c.OpensearchURL != "" {

diff --git a/cmd/dbaas_external_endpoint_create_rsyslog.go b/cmd/dbaas_external_endpoint_create_rsyslog.go
@@ -15,8 +15,8 @@ func (c *dbaasExternalEndpointCreateCmd) createRsyslog(_ *cobra.Command, _ []str
 		return err
 	}
 
-	rsyslogRequestPayload := v3.DBAASEndpointRsyslogPayload{
-		Settings: &v3.DBAASEndpointRsyslogPayloadSettings{},
+	rsyslogRequestPayload := v3.DBAASEndpointRsyslogInputCreate{
+		Settings: &v3.DBAASEndpointRsyslogInputCreateSettings{},
 	}
 
 	if c.RsyslogCA != "" {

diff --git a/cmd/dbaas_external_endpoint_show_datadog.go b/cmd/dbaas_external_endpoint_show_datadog.go
@@ -16,7 +16,7 @@ type datadogOutput struct {
 	ID       string                  `json:"id"`
 	Name     string                  `json:"name"`
 	Type     string                  `json:"type"`
-	Settings v3.DBAASEndpointDatadog `json:"settings"`
+	Settings v3.DBAASExternalEndpointDatadogOutputSettings `json:"settings"`
 }
 
 func (o *datadogOutput) ToJSON() { output.JSON(o) }

diff --git a/cmd/dbaas_external_endpoint_show_elasticsearch.go b/cmd/dbaas_external_endpoint_show_elasticsearch.go
@@ -16,7 +16,7 @@ type elasticsearchOutput struct {
 	ID       string                    `json:"id"`
 	Name     string                    `json:"name"`
 	Type     string                    `json:"type"`
-	Settings v3.DBAASEndpointElasticsearch `json:"settings"`
+	Settings v3.DBAASEndpointElasticsearchOptionalFields `json:"settings"`
 }
 
 func (o *elasticsearchOutput) ToJSON() { output.JSON(o) }

diff --git a/cmd/dbaas_external_endpoint_show_opensearch.go b/cmd/dbaas_external_endpoint_show_opensearch.go
@@ -16,7 +16,7 @@ type opensearchOutput struct {
 	ID       string                    `json:"id"`
 	Name     string                    `json:"name"`
 	Type     string                    `json:"type"`
-	Settings v3.DBAASEndpointOpensearch `json:"settings"`
+	Settings v3.DBAASEndpointOpensearchOptionalFields `json:"settings"`
 }
 
 func (o *opensearchOutput) ToJSON() { output.JSON(o) }

diff --git a/cmd/dbaas_external_endpoint_show_prometheus.go b/cmd/dbaas_external_endpoint_show_prometheus.go
@@ -15,7 +15,7 @@ type prometheusOutput struct {
 	ID       string                    `json:"id"`
 	Name     string                    `json:"name"`
 	Type     string                    `json:"type"`
-	Settings v3.DBAASEndpointPrometheus `json:"settings"`
+	Settings v3.DBAASEndpointExternalPrometheusOutputSettings `json:"settings"`
 }
 
 func (o *prometheusOutput) ToJSON() { output.JSON(o) }

diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	github.com/aws/smithy-go v1.1.0
 	github.com/dustin/go-humanize v1.0.1
 	github.com/exoscale/egoscale v0.102.4
-	github.com/exoscale/egoscale/v3 v3.1.6
+	github.com/exoscale/egoscale/v3 v3.1.7
 	github.com/exoscale/openapi-cli-generator v1.1.0
 	github.com/fatih/camelcase v1.0.0
 	github.com/google/uuid v1.4.0

diff --git a/go.sum b/go.sum
@@ -197,8 +197,8 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
 github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws=
 github.com/exoscale/egoscale v0.102.4 h1:GBKsZMIOzwBfSu+4ZmWka3Ejf2JLiaBDHp4CQUgvp2E=
 github.com/exoscale/egoscale v0.102.4/go.mod h1:ROSmPtle0wvf91iLZb09++N/9BH2Jo9XxIpAEumvocA=
-github.com/exoscale/egoscale/v3 v3.1.6 h1:bTxsGG2B+9iHjziTfiySJ+FiZHyAiKiIoTs/Qfq6Orw=
-github.com/exoscale/egoscale/v3 v3.1.6/go.mod h1:GHKucK/J26v8PGWztGdhxWNMjrjG9PbelxKCJ4YI11Q=
+github.com/exoscale/egoscale/v3 v3.1.7 h1:Q6p9tOVY0IiOW0fUpaPQWY7ggGEuSPZLAGxFgDd2sCE=
+github.com/exoscale/egoscale/v3 v3.1.7/go.mod h1:GHKucK/J26v8PGWztGdhxWNMjrjG9PbelxKCJ4YI11Q=
 github.com/exoscale/openapi-cli-generator v1.1.0 h1:fYjmPqHR5vxlOBrbvde7eo7bISNQIFxsGn4A5/acwKA=
 github.com/exoscale/openapi-cli-generator v1.1.0/go.mod h1:TZBnbT7f3hJ5ImyUphJwRM+X5xF/zCQZ6o8a42gQeTs=
 github.com/fatih/camelcase v1.0.0 h1:hxNvNX/xYBp0ovncs8WyWZrOrpBNub/JfaMvbURyft8=

diff --git a/vendor/github.com/exoscale/egoscale/v3/client.go b/vendor/github.com/exoscale/egoscale/v3/client.go
diff --git a/vendor/github.com/exoscale/egoscale/v3/operations.go b/vendor/github.com/exoscale/egoscale/v3/operations.go