diff --git a/digitalocean/nfs/resource_nfs_attachment.go b/digitalocean/nfs/resource_nfs_attachment.go index 5d89556cc..94dd37524 100644 --- a/digitalocean/nfs/resource_nfs_attachment.go +++ b/digitalocean/nfs/resource_nfs_attachment.go @@ -107,7 +107,7 @@ func resourceDigitalOceanNfsAttachmentCreate(ctx context.Context, d *schema.Reso fmt.Errorf("[WARN] Error attaching share (%s) to VPC (%s): %s", shareId, vpcId, err)) } - log.Printf("[DEBUG] Share attach action id: %d", action.ID) + log.Printf("[DEBUG] Share attach action id: %s", action.ID) // Poll the share to check VPC Id if err = waitForNfsAttach(ctx, client, shareId, region, vpcId); err != nil { @@ -214,7 +214,7 @@ func resourceDigitalOceanNfsAttachmentDelete(ctx context.Context, d *schema.Reso fmt.Errorf("[WARN] Error detaching share (%s) from VPC (%s): %s", shareId, vpcId, err)) } - log.Printf("[DEBUG] Share detach action id: %d", action.ID) + log.Printf("[DEBUG] Share detach action id: %s", action.ID) // Poll the share to check if err = waitForNfsDetach(ctx, client, shareId, region, vpcId); err != nil { diff --git a/go.mod b/go.mod index 260d5e61d..fada88c72 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ toolchain go1.23.1 require ( github.com/aws/aws-sdk-go v1.42.18 - github.com/digitalocean/godo v1.184.1-0.20260410132851-6a015e2e3b32 + github.com/digitalocean/godo v1.185.0 github.com/hashicorp/awspolicyequivalence v1.5.0 github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 github.com/hashicorp/go-uuid v1.0.3 diff --git a/go.sum b/go.sum index 9e49bb69f..9070289fb 100644 --- a/go.sum +++ b/go.sum @@ -25,8 +25,6 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/digitalocean/godo v1.184.1-0.20260410132851-6a015e2e3b32 h1:bO0M6ODWgllf/LlR0wzlxIxiMMcJuHvlrQdDfhC4ufY= -github.com/digitalocean/godo v1.184.1-0.20260410132851-6a015e2e3b32/go.mod h1:xQsWpVCCbkDrWisHA72hPzPlnC+4W5w/McZY5ij9uvU= github.com/digitalocean/godo v1.185.0 h1:T5OKna5yQiRpGQ/FvaPX1E4dZURPV70CzWTn/QXa6Xs= github.com/digitalocean/godo v1.185.0/go.mod h1:xQsWpVCCbkDrWisHA72hPzPlnC+4W5w/McZY5ij9uvU= github.com/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= diff --git a/vendor/github.com/digitalocean/godo/CHANGELOG.md b/vendor/github.com/digitalocean/godo/CHANGELOG.md index f0d9f0c1e..d559b84a4 100644 --- a/vendor/github.com/digitalocean/godo/CHANGELOG.md +++ b/vendor/github.com/digitalocean/godo/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## [1.185.0] - 2026-04-14 + +- #990 - @greeshmapill - APPS-12973: Add request based autoscaling changes to app spec +- #989 - @andrehernandez0 - NfsAction - type inconsistency bug fix +- #988 - @divyanshgupta-dodeveloper - NFRNC-701: Added provider model id to accommodate schema updates in DI Creation request + ## [1.184.0] - 2026-04-01 - #984 - Change ContextWindow to string diff --git a/vendor/github.com/digitalocean/godo/apps.gen.go b/vendor/github.com/digitalocean/godo/apps.gen.go index bf18d3e2a..a542043bf 100644 --- a/vendor/github.com/digitalocean/godo/apps.gen.go +++ b/vendor/github.com/digitalocean/godo/apps.gen.go @@ -124,7 +124,7 @@ const ( AppAlertSpecOperator_LessThan AppAlertSpecOperator = "LESS_THAN" ) -// AppAlertSpecRule - CPU_UTILIZATION: Represents CPU for a given container instance. Only applicable at the component level. - MEM_UTILIZATION: Represents RAM for a given container instance. Only applicable at the component level. - RESTART_COUNT: Represents restart count for a given container instance. Only applicable at the component level. - DEPLOYMENT_FAILED: Represents whether a deployment has failed. Only applicable at the app level. - DEPLOYMENT_LIVE: Represents whether a deployment has succeeded. Only applicable at the app level. - DEPLOYMENT_STARTED: Represents whether a deployment has started. Only applicable at the app level. - DEPLOYMENT_CANCELED: Represents whether a deployment has been canceled. Only applicable at the app level. - DOMAIN_FAILED: Represents whether a domain configuration has failed. Only applicable at the app level. - DOMAIN_LIVE: Represents whether a domain configuration has succeeded. Only applicable at the app level. - AUTOSCALE_FAILED: Represents whether autoscaling has failed. Only applicable at the app level. - AUTOSCALE_SUCCEEDED: Represents whether autoscaling has succeeded. Only applicable at the app level. - FUNCTIONS_ACTIVATION_COUNT: Represents an activation count for a given functions instance. Only applicable to functions components. - FUNCTIONS_AVERAGE_DURATION_MS: Represents the average duration for function runtimes. Only applicable to functions components. - FUNCTIONS_ERROR_RATE_PER_MINUTE: Represents an error rate per minute for a given functions instance. Only applicable to functions components. - FUNCTIONS_AVERAGE_WAIT_TIME_MS: Represents the average wait time for functions. Only applicable to functions components. - FUNCTIONS_ERROR_COUNT: Represents an error count for a given functions instance. Only applicable to functions components. - FUNCTIONS_GB_RATE_PER_SECOND: Represents the rate of memory consumption (GB x seconds) for functions. Only applicable to functions components. +// AppAlertSpecRule - CPU_UTILIZATION: Represents CPU for a given container instance. Only applicable at the component level. - MEM_UTILIZATION: Represents RAM for a given container instance. Only applicable at the component level. - RESTART_COUNT: Represents restart count for a given container instance. Only applicable at the component level. - DEPLOYMENT_FAILED: Represents whether a deployment has failed. Only applicable at the app level. - DEPLOYMENT_LIVE: Represents whether a deployment has succeeded. Only applicable at the app level. - DEPLOYMENT_STARTED: Represents whether a deployment has started. Only applicable at the app level. - DEPLOYMENT_CANCELED: Represents whether a deployment has been canceled. Only applicable at the app level. - DOMAIN_FAILED: Represents whether a domain configuration has failed. Only applicable at the app level. - DOMAIN_LIVE: Represents whether a domain configuration has succeeded. Only applicable at the app level. - AUTOSCALE_FAILED: Represents whether autoscaling has failed. Only applicable at the app level. - AUTOSCALE_SUCCEEDED: Represents whether autoscaling has succeeded. Only applicable at the app level. - JOB_INVOCATION_FAILED: Represents whether a job invocation has failed. Only applicable to scheduled job components. - FUNCTIONS_ACTIVATION_COUNT: Represents an activation count for a given functions instance. Only applicable to functions components. - FUNCTIONS_AVERAGE_DURATION_MS: Represents the average duration for function runtimes. Only applicable to functions components. - FUNCTIONS_ERROR_RATE_PER_MINUTE: Represents an error rate per minute for a given functions instance. Only applicable to functions components. - FUNCTIONS_AVERAGE_WAIT_TIME_MS: Represents the average wait time for functions. Only applicable to functions components. - FUNCTIONS_ERROR_COUNT: Represents an error count for a given functions instance. Only applicable to functions components. - FUNCTIONS_GB_RATE_PER_SECOND: Represents the rate of memory consumption (GB x seconds) for functions. Only applicable to functions components. - REQUESTS_PER_SECOND: Represents requests per second for a service. Only applicable to service components. - REQUEST_DURATION_P95_MS: Represents request duration p95 in milliseconds for a service. Only applicable to service components. type AppAlertSpecRule string // List of AppAlertSpecRule @@ -148,6 +148,8 @@ const ( AppAlertSpecRule_FunctionsAverageWaitTimeMs AppAlertSpecRule = "FUNCTIONS_AVERAGE_WAIT_TIME_MS" AppAlertSpecRule_FunctionsErrorCount AppAlertSpecRule = "FUNCTIONS_ERROR_COUNT" AppAlertSpecRule_FunctionsGBRatePerSecond AppAlertSpecRule = "FUNCTIONS_GB_RATE_PER_SECOND" + AppAlertSpecRule_RequestsPerSecond AppAlertSpecRule = "REQUESTS_PER_SECOND" + AppAlertSpecRule_RequestDurationP95Ms AppAlertSpecRule = "REQUEST_DURATION_P95_MS" ) // AppAlertSpecWindow the model 'AppAlertSpecWindow' @@ -177,9 +179,23 @@ type AppAutoscalingSpecMetricCPU struct { Percent int64 `json:"percent,omitempty"` } +// AppAutoscalingSpecMetricRequestDuration struct for AppAutoscalingSpecMetricRequestDuration +type AppAutoscalingSpecMetricRequestDuration struct { + // The p95 target request duration in milliseconds for the component. + P95Milliseconds int64 `json:"p95_milliseconds,omitempty"` +} + +// AppAutoscalingSpecMetricRequestsPerSecond struct for AppAutoscalingSpecMetricRequestsPerSecond +type AppAutoscalingSpecMetricRequestsPerSecond struct { + // The target number of requests per second per instance for the component. + PerInstance int64 `json:"per_instance,omitempty"` +} + // AppAutoscalingSpecMetrics struct for AppAutoscalingSpecMetrics type AppAutoscalingSpecMetrics struct { - CPU *AppAutoscalingSpecMetricCPU `json:"cpu,omitempty"` + CPU *AppAutoscalingSpecMetricCPU `json:"cpu,omitempty"` + RequestsPerSecond *AppAutoscalingSpecMetricRequestsPerSecond `json:"requests_per_second,omitempty"` + RequestDuration *AppAutoscalingSpecMetricRequestDuration `json:"request_duration,omitempty"` } // AppBuildConfig struct for AppBuildConfig @@ -756,13 +772,15 @@ type AppWorkerSpecTermination struct { type AutoscalerActionScaleChange struct { From int64 `json:"from,omitempty"` To int64 `json:"to,omitempty"` + // The metric that triggered the scale change while scaling up. Known values are \"cpu\", \"requests_per_second\", \"request_duration\". For inactivity sleep, \"scale_from_zero\" and \"scale_to_zero\" are used. + TriggeringMetric string `json:"triggering_metric,omitempty"` } // AutoscalingEventComponentScaleChange struct for AutoscalingEventComponentScaleChange type AutoscalingEventComponentScaleChange struct { From int64 `json:"from,omitempty"` To int64 `json:"to,omitempty"` - // The metric that triggered the scale change while scaling up. Known values are "cpu", "requests_per_second", "request_duration". For inactivity sleep, "scale_from_zero" and "scale_to_zero" are used. + // The metric that triggered the scale change while scaling up. Known values are \"cpu\", \"requests_per_second\", \"request_duration\". For inactivity sleep, \"scale_from_zero\" and \"scale_to_zero\" are used. TriggeringMetric string `json:"triggering_metric,omitempty"` } diff --git a/vendor/github.com/digitalocean/godo/apps_accessors.go b/vendor/github.com/digitalocean/godo/apps_accessors.go index d105e8a9c..5dcdeb1b3 100644 --- a/vendor/github.com/digitalocean/godo/apps_accessors.go +++ b/vendor/github.com/digitalocean/godo/apps_accessors.go @@ -405,6 +405,22 @@ func (a *AppAutoscalingSpecMetricCPU) GetPercent() int64 { return a.Percent } +// GetP95Milliseconds returns the P95Milliseconds field. +func (a *AppAutoscalingSpecMetricRequestDuration) GetP95Milliseconds() int64 { + if a == nil { + return 0 + } + return a.P95Milliseconds +} + +// GetPerInstance returns the PerInstance field. +func (a *AppAutoscalingSpecMetricRequestsPerSecond) GetPerInstance() int64 { + if a == nil { + return 0 + } + return a.PerInstance +} + // GetCPU returns the CPU field. func (a *AppAutoscalingSpecMetrics) GetCPU() *AppAutoscalingSpecMetricCPU { if a == nil { @@ -413,6 +429,22 @@ func (a *AppAutoscalingSpecMetrics) GetCPU() *AppAutoscalingSpecMetricCPU { return a.CPU } +// GetRequestDuration returns the RequestDuration field. +func (a *AppAutoscalingSpecMetrics) GetRequestDuration() *AppAutoscalingSpecMetricRequestDuration { + if a == nil { + return nil + } + return a.RequestDuration +} + +// GetRequestsPerSecond returns the RequestsPerSecond field. +func (a *AppAutoscalingSpecMetrics) GetRequestsPerSecond() *AppAutoscalingSpecMetricRequestsPerSecond { + if a == nil { + return nil + } + return a.RequestsPerSecond +} + // GetCNBVersioning returns the CNBVersioning field. func (a *AppBuildConfig) GetCNBVersioning() *AppBuildConfigCNBVersioning { if a == nil { @@ -2637,6 +2669,14 @@ func (a *AutoscalerActionScaleChange) GetTo() int64 { return a.To } +// GetTriggeringMetric returns the TriggeringMetric field. +func (a *AutoscalerActionScaleChange) GetTriggeringMetric() string { + if a == nil { + return "" + } + return a.TriggeringMetric +} + // GetFrom returns the From field. func (a *AutoscalingEventComponentScaleChange) GetFrom() int64 { if a == nil { diff --git a/vendor/github.com/digitalocean/godo/godo.go b/vendor/github.com/digitalocean/godo/godo.go index cab0dbe84..e5f35af22 100644 --- a/vendor/github.com/digitalocean/godo/godo.go +++ b/vendor/github.com/digitalocean/godo/godo.go @@ -21,7 +21,7 @@ import ( ) const ( - libraryVersion = "1.184.0" + libraryVersion = "1.185.0" defaultBaseURL = "https://api.digitalocean.com/" userAgent = "godo/" + libraryVersion mediaType = "application/json" diff --git a/vendor/github.com/digitalocean/godo/nfs_actions.go b/vendor/github.com/digitalocean/godo/nfs_actions.go index e6a29c4d5..0f8127f36 100644 --- a/vendor/github.com/digitalocean/godo/nfs_actions.go +++ b/vendor/github.com/digitalocean/godo/nfs_actions.go @@ -28,7 +28,7 @@ var _ NfsActionsService = &NfsActionsServiceOp{} // NfsAction represents an NFS action type NfsAction struct { - ID int `json:"id"` + ID string `json:"id"` Status string `json:"status"` Type string `json:"type"` StartedAt *Timestamp `json:"started_at"` diff --git a/vendor/modules.txt b/vendor/modules.txt index 5cfdf183f..1b9419f80 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -58,7 +58,7 @@ github.com/aws/aws-sdk-go/service/sts/stsiface # github.com/davecgh/go-spew v1.1.1 ## explicit github.com/davecgh/go-spew/spew -# github.com/digitalocean/godo v1.184.1-0.20260410132851-6a015e2e3b32 +# github.com/digitalocean/godo v1.185.0 ## explicit; go 1.23.0 github.com/digitalocean/godo github.com/digitalocean/godo/metrics