Fix/stackittpr 102 objectstorage handling region in individual resources (#711)
* Revert "fix: make resource/data-source specific region attribute read-only (#682)"
This reverts commit 3e8dcc542b.
* fix: Support individual regions
* fix: review findings
This commit is contained in:
parent
81f876adea
commit
c257ac49e2
105 changed files with 176 additions and 143 deletions
|
|
@ -124,7 +124,7 @@ func (r *barResource) Configure(ctx context.Context, req resource.ConfigureReque
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = foo.NewAPIClient(
|
apiClient, err = foo.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.DefaultRegion),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,9 @@ data "stackit_objectstorage_bucket" "example" {
|
||||||
|
|
||||||
- `name` (String) The bucket name. It must be DNS conform.
|
- `name` (String) The bucket name. It must be DNS conform.
|
||||||
- `project_id` (String) STACKIT Project ID to which the bucket is associated.
|
- `project_id` (String) STACKIT Project ID to which the bucket is associated.
|
||||||
|
|
||||||
|
### Optional
|
||||||
|
|
||||||
- `region` (String) The resource region. If not defined, the provider region is used.
|
- `region` (String) The resource region. If not defined, the provider region is used.
|
||||||
|
|
||||||
### Read-Only
|
### Read-Only
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,9 @@ data "stackit_objectstorage_credentials_group" "example" {
|
||||||
- `credential_id` (String) The credential ID.
|
- `credential_id` (String) The credential ID.
|
||||||
- `credentials_group_id` (String) The credential group ID.
|
- `credentials_group_id` (String) The credential group ID.
|
||||||
- `project_id` (String) STACKIT Project ID to which the credential group is associated.
|
- `project_id` (String) STACKIT Project ID to which the credential group is associated.
|
||||||
|
|
||||||
|
### Optional
|
||||||
|
|
||||||
- `region` (String) The resource region. If not defined, the provider region is used.
|
- `region` (String) The resource region. If not defined, the provider region is used.
|
||||||
|
|
||||||
### Read-Only
|
### Read-Only
|
||||||
|
|
|
||||||
|
|
@ -25,12 +25,12 @@ data "stackit_objectstorage_credentials_group" "example" {
|
||||||
### Required
|
### Required
|
||||||
|
|
||||||
- `project_id` (String) Object Storage Project ID to which the credentials group is associated.
|
- `project_id` (String) Object Storage Project ID to which the credentials group is associated.
|
||||||
- `region` (String) The resource region. If not defined, the provider region is used.
|
|
||||||
|
|
||||||
### Optional
|
### Optional
|
||||||
|
|
||||||
- `credentials_group_id` (String) The credentials group ID.
|
- `credentials_group_id` (String) The credentials group ID.
|
||||||
- `name` (String) The credentials group's display name.
|
- `name` (String) The credentials group's display name.
|
||||||
|
- `region` (String) The resource region. If not defined, the provider region is used.
|
||||||
|
|
||||||
### Read-Only
|
### Read-Only
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -154,6 +154,7 @@ Note: AWS specific checks must be skipped as they do not work on STACKIT. For de
|
||||||
- `argus_custom_endpoint` (String, Deprecated) Custom endpoint for the Argus service
|
- `argus_custom_endpoint` (String, Deprecated) Custom endpoint for the Argus service
|
||||||
- `authorization_custom_endpoint` (String) Custom endpoint for the Membership service
|
- `authorization_custom_endpoint` (String) Custom endpoint for the Membership service
|
||||||
- `credentials_path` (String) Path of JSON from where the credentials are read. Takes precedence over the env var `STACKIT_CREDENTIALS_PATH`. Default value is `~/.stackit/credentials.json`.
|
- `credentials_path` (String) Path of JSON from where the credentials are read. Takes precedence over the env var `STACKIT_CREDENTIALS_PATH`. Default value is `~/.stackit/credentials.json`.
|
||||||
|
- `default_region` (String) Region will be used as the default location for regional services. Not all services require a region, some are global
|
||||||
- `dns_custom_endpoint` (String) Custom endpoint for the DNS service
|
- `dns_custom_endpoint` (String) Custom endpoint for the DNS service
|
||||||
- `enable_beta_resources` (Boolean) Enable beta resources. Default is false.
|
- `enable_beta_resources` (Boolean) Enable beta resources. Default is false.
|
||||||
- `iaas_custom_endpoint` (String) Custom endpoint for the IaaS service
|
- `iaas_custom_endpoint` (String) Custom endpoint for the IaaS service
|
||||||
|
|
@ -169,7 +170,7 @@ Note: AWS specific checks must be skipped as they do not work on STACKIT. For de
|
||||||
- `private_key_path` (String) Path for the private RSA key used for authentication, relevant for the key flow. It takes precedence over the private key that is included in the service account key.
|
- `private_key_path` (String) Path for the private RSA key used for authentication, relevant for the key flow. It takes precedence over the private key that is included in the service account key.
|
||||||
- `rabbitmq_custom_endpoint` (String) Custom endpoint for the RabbitMQ service
|
- `rabbitmq_custom_endpoint` (String) Custom endpoint for the RabbitMQ service
|
||||||
- `redis_custom_endpoint` (String) Custom endpoint for the Redis service
|
- `redis_custom_endpoint` (String) Custom endpoint for the Redis service
|
||||||
- `region` (String) Region will be used as the default location for regional services. Not all services require a region, some are global
|
- `region` (String, Deprecated) Region will be used as the default location for regional services. Not all services require a region, some are global
|
||||||
- `resourcemanager_custom_endpoint` (String) Custom endpoint for the Resource Manager service
|
- `resourcemanager_custom_endpoint` (String) Custom endpoint for the Resource Manager service
|
||||||
- `secretsmanager_custom_endpoint` (String) Custom endpoint for the Secrets Manager service
|
- `secretsmanager_custom_endpoint` (String) Custom endpoint for the Secrets Manager service
|
||||||
- `server_backup_custom_endpoint` (String) Custom endpoint for the Server Backup service
|
- `server_backup_custom_endpoint` (String) Custom endpoint for the Server Backup service
|
||||||
|
|
|
||||||
|
|
@ -14,9 +14,11 @@ import (
|
||||||
const Separator = ","
|
const Separator = ","
|
||||||
|
|
||||||
type ProviderData struct {
|
type ProviderData struct {
|
||||||
RoundTripper http.RoundTripper
|
RoundTripper http.RoundTripper
|
||||||
ServiceAccountEmail string // Deprecated: ServiceAccountEmail is not required and will be removed after 12th June 2025.
|
ServiceAccountEmail string // Deprecated: ServiceAccountEmail is not required and will be removed after 12th June 2025.
|
||||||
|
// Deprecated: Use DefaultRegion instead
|
||||||
Region string
|
Region string
|
||||||
|
DefaultRegion string
|
||||||
ArgusCustomEndpoint string
|
ArgusCustomEndpoint string
|
||||||
AuthorizationCustomEndpoint string
|
AuthorizationCustomEndpoint string
|
||||||
DnsCustomEndpoint string
|
DnsCustomEndpoint string
|
||||||
|
|
@ -41,6 +43,17 @@ type ProviderData struct {
|
||||||
EnableBetaResources bool
|
EnableBetaResources bool
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetRegion returns the effective region for the provider, falling back to the deprecated _region_ attribute
|
||||||
|
func (pd *ProviderData) GetRegion() string {
|
||||||
|
if pd.DefaultRegion != "" {
|
||||||
|
return pd.DefaultRegion
|
||||||
|
} else if pd.Region != "" {
|
||||||
|
return pd.Region
|
||||||
|
}
|
||||||
|
// final fallback
|
||||||
|
return "eu01"
|
||||||
|
}
|
||||||
|
|
||||||
// DiagsToError Converts TF diagnostics' errors into an error with a human-readable description.
|
// DiagsToError Converts TF diagnostics' errors into an error with a human-readable description.
|
||||||
// If there are no errors, the output is nil
|
// If there are no errors, the output is nil
|
||||||
func DiagsToError(diags diag.Diagnostics) error {
|
func DiagsToError(diags diag.Diagnostics) error {
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@ func (r *credentialResource) Configure(ctx context.Context, req resource.Configu
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = argus.NewAPIClient(
|
apiClient, err = argus.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ func (d *instanceDataSource) Configure(ctx context.Context, req datasource.Confi
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = argus.NewAPIClient(
|
apiClient, err = argus.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -362,7 +362,7 @@ func (r *instanceResource) Configure(ctx context.Context, req resource.Configure
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = argus.NewAPIClient(
|
apiClient, err = argus.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ func (d *scrapeConfigDataSource) Configure(ctx context.Context, req datasource.C
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = argus.NewAPIClient(
|
apiClient, err = argus.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -137,7 +137,7 @@ func (r *scrapeConfigResource) Configure(ctx context.Context, req resource.Confi
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = argus.NewAPIClient(
|
apiClient, err = argus.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -68,7 +68,7 @@ func (d *affinityGroupDatasource) Configure(ctx context.Context, req datasource.
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -94,7 +94,7 @@ func (r *affinityGroupResource) Configure(ctx context.Context, req resource.Conf
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -93,7 +93,7 @@ func (d *imageDataSource) Configure(ctx context.Context, req datasource.Configur
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -153,7 +153,7 @@ func (r *imageResource) Configure(ctx context.Context, req resource.ConfigureReq
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,7 @@ func (d *keyPairDataSource) Configure(ctx context.Context, req datasource.Config
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -89,7 +89,7 @@ func (r *keyPairResource) Configure(ctx context.Context, req resource.ConfigureR
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,7 @@ func (d *networkDataSource) Configure(ctx context.Context, req datasource.Config
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -100,7 +100,7 @@ func (r *networkResource) Configure(ctx context.Context, req resource.ConfigureR
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ func (d *networkAreaDataSource) Configure(ctx context.Context, req datasource.Co
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -118,7 +118,7 @@ func (r *networkAreaResource) Configure(ctx context.Context, req resource.Config
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ func (d *networkAreaRouteDataSource) Configure(ctx context.Context, req datasour
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -93,7 +93,7 @@ func (r *networkAreaRouteResource) Configure(ctx context.Context, req resource.C
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,7 @@ func (d *networkInterfaceDataSource) Configure(ctx context.Context, req datasour
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -103,7 +103,7 @@ func (r *networkInterfaceResource) Configure(ctx context.Context, req resource.C
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,7 @@ func (r *networkInterfaceAttachResource) Configure(ctx context.Context, req reso
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ func (d *publicIpDataSource) Configure(ctx context.Context, req datasource.Confi
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -92,7 +92,7 @@ func (r *publicIpResource) Configure(ctx context.Context, req resource.Configure
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ func (r *publicIpAssociateResource) Configure(ctx context.Context, req resource.
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -87,7 +87,7 @@ func (d *publicIpRangesDataSource) Configure(ctx context.Context, req datasource
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ func (d *securityGroupDataSource) Configure(ctx context.Context, req datasource.
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -96,7 +96,7 @@ func (r *securityGroupResource) Configure(ctx context.Context, req resource.Conf
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ func (d *securityGroupRuleDataSource) Configure(ctx context.Context, req datasou
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -140,7 +140,7 @@ func (r *securityGroupRuleResource) Configure(ctx context.Context, req resource.
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -98,7 +98,7 @@ func (d *serverDataSource) Configure(ctx context.Context, req datasource.Configu
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -181,7 +181,7 @@ func (r *serverResource) Configure(ctx context.Context, req resource.ConfigureRe
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -88,7 +88,7 @@ func (r *networkInterfaceAttachResource) Configure(ctx context.Context, req reso
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,7 @@ func (d *volumeDataSource) Configure(ctx context.Context, req datasource.Configu
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -129,7 +129,7 @@ func (r *volumeResource) Configure(ctx context.Context, req resource.ConfigureRe
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ func (r *volumeAttachResource) Configure(ctx context.Context, req resource.Confi
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = iaas.NewAPIClient(
|
apiClient, err = iaas.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ func (r *credentialResource) Configure(ctx context.Context, req resource.Configu
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = loadbalancer.NewAPIClient(
|
apiClient, err = loadbalancer.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ func (r *loadBalancerDataSource) Configure(ctx context.Context, req datasource.C
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = loadbalancer.NewAPIClient(
|
apiClient, err = loadbalancer.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -205,7 +205,7 @@ func (r *loadBalancerResource) Configure(ctx context.Context, req resource.Confi
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = loadbalancer.NewAPIClient(
|
apiClient, err = loadbalancer.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ func (r *observabilityCredentialResource) Configure(ctx context.Context, req res
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = loadbalancer.NewAPIClient(
|
apiClient, err = loadbalancer.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ func (r *credentialDataSource) Configure(ctx context.Context, req datasource.Con
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = logme.NewAPIClient(
|
apiClient, err = logme.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,7 @@ func (r *credentialResource) Configure(ctx context.Context, req resource.Configu
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = logme.NewAPIClient(
|
apiClient, err = logme.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ func (r *instanceDataSource) Configure(ctx context.Context, req datasource.Confi
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = logme.NewAPIClient(
|
apiClient, err = logme.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -142,7 +142,7 @@ func (r *instanceResource) Configure(ctx context.Context, req resource.Configure
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = logme.NewAPIClient(
|
apiClient, err = logme.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ func (r *credentialDataSource) Configure(ctx context.Context, req datasource.Con
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = mariadb.NewAPIClient(
|
apiClient, err = mariadb.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,7 @@ func (r *credentialResource) Configure(ctx context.Context, req resource.Configu
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = mariadb.NewAPIClient(
|
apiClient, err = mariadb.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ func (r *instanceDataSource) Configure(ctx context.Context, req datasource.Confi
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = mariadb.NewAPIClient(
|
apiClient, err = mariadb.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@ func (r *instanceResource) Configure(ctx context.Context, req resource.Configure
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = mariadb.NewAPIClient(
|
apiClient, err = mariadb.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ func (r *instanceDataSource) Configure(ctx context.Context, req datasource.Confi
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = mongodbflex.NewAPIClient(
|
apiClient, err = mongodbflex.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -144,7 +144,7 @@ func (r *instanceResource) Configure(ctx context.Context, req resource.Configure
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = mongodbflex.NewAPIClient(
|
apiClient, err = mongodbflex.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,7 @@ func (r *userDataSource) Configure(ctx context.Context, req datasource.Configure
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = mongodbflex.NewAPIClient(
|
apiClient, err = mongodbflex.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,7 @@ func (r *userResource) Configure(ctx context.Context, req resource.ConfigureRequ
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = mongodbflex.NewAPIClient(
|
apiClient, err = mongodbflex.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,7 @@ func (r *bucketDataSource) Schema(_ context.Context, _ datasource.SchemaRequest,
|
||||||
"project_id": "STACKIT Project ID to which the bucket is associated.",
|
"project_id": "STACKIT Project ID to which the bucket is associated.",
|
||||||
"url_path_style": "URL in path style.",
|
"url_path_style": "URL in path style.",
|
||||||
"url_virtual_hosted_style": "URL in virtual hosted style.",
|
"url_virtual_hosted_style": "URL in virtual hosted style.",
|
||||||
"region": "The resource region. Read-only attribute that reflects the provider region.",
|
"region": "The resource region. If not defined, the provider region is used.",
|
||||||
}
|
}
|
||||||
|
|
||||||
resp.Schema = schema.Schema{
|
resp.Schema = schema.Schema{
|
||||||
|
|
@ -117,8 +117,7 @@ func (r *bucketDataSource) Schema(_ context.Context, _ datasource.SchemaRequest,
|
||||||
},
|
},
|
||||||
"region": schema.StringAttribute{
|
"region": schema.StringAttribute{
|
||||||
// the region cannot be found automatically, so it has to be passed
|
// the region cannot be found automatically, so it has to be passed
|
||||||
Optional: false,
|
Optional: true,
|
||||||
Computed: true,
|
|
||||||
Description: descriptions["region"],
|
Description: descriptions["region"],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
@ -137,7 +136,7 @@ func (r *bucketDataSource) Read(ctx context.Context, req datasource.ReadRequest,
|
||||||
bucketName := model.Name.ValueString()
|
bucketName := model.Name.ValueString()
|
||||||
var region string
|
var region string
|
||||||
if utils.IsUndefined(model.Region) {
|
if utils.IsUndefined(model.Region) {
|
||||||
region = r.providerData.Region
|
region = r.providerData.GetRegion()
|
||||||
} else {
|
} else {
|
||||||
region = model.Region.ValueString()
|
region = model.Region.ValueString()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@ func (r *bucketResource) ModifyPlan(ctx context.Context, req resource.ModifyPlan
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
utils.AdaptRegion(ctx, configModel.Region, &planModel.Region, r.providerData.Region, resp)
|
utils.AdaptRegion(ctx, configModel.Region, &planModel.Region, r.providerData.GetRegion(), resp)
|
||||||
if resp.Diagnostics.HasError() {
|
if resp.Diagnostics.HasError() {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
@ -132,7 +132,7 @@ func (r *bucketResource) Schema(_ context.Context, _ resource.SchemaRequest, res
|
||||||
"project_id": "STACKIT Project ID to which the bucket is associated.",
|
"project_id": "STACKIT Project ID to which the bucket is associated.",
|
||||||
"url_path_style": "URL in path style.",
|
"url_path_style": "URL in path style.",
|
||||||
"url_virtual_hosted_style": "URL in virtual hosted style.",
|
"url_virtual_hosted_style": "URL in virtual hosted style.",
|
||||||
"region": "The resource region. Read-only attribute that reflects the provider region.",
|
"region": "The resource region. If not defined, the provider region is used.",
|
||||||
}
|
}
|
||||||
|
|
||||||
resp.Schema = schema.Schema{
|
resp.Schema = schema.Schema{
|
||||||
|
|
@ -175,7 +175,7 @@ func (r *bucketResource) Schema(_ context.Context, _ resource.SchemaRequest, res
|
||||||
Computed: true,
|
Computed: true,
|
||||||
},
|
},
|
||||||
"region": schema.StringAttribute{
|
"region": schema.StringAttribute{
|
||||||
Optional: false,
|
Optional: true,
|
||||||
// must be computed to allow for storing the override value from the provider
|
// must be computed to allow for storing the override value from the provider
|
||||||
Computed: true,
|
Computed: true,
|
||||||
Description: descriptions["region"],
|
Description: descriptions["region"],
|
||||||
|
|
@ -249,7 +249,7 @@ func (r *bucketResource) Read(ctx context.Context, req resource.ReadRequest, res
|
||||||
bucketName := model.Name.ValueString()
|
bucketName := model.Name.ValueString()
|
||||||
region := model.Region.ValueString()
|
region := model.Region.ValueString()
|
||||||
if region == "" {
|
if region == "" {
|
||||||
region = r.providerData.Region
|
region = r.providerData.GetRegion()
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx = tflog.SetField(ctx, "project_id", projectId)
|
ctx = tflog.SetField(ctx, "project_id", projectId)
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,7 @@ func (r *credentialDataSource) Schema(_ context.Context, _ datasource.SchemaRequ
|
||||||
"credential_id": "The credential ID.",
|
"credential_id": "The credential ID.",
|
||||||
"credentials_group_id": "The credential group ID.",
|
"credentials_group_id": "The credential group ID.",
|
||||||
"project_id": "STACKIT Project ID to which the credential group is associated.",
|
"project_id": "STACKIT Project ID to which the credential group is associated.",
|
||||||
"region": "The resource region. Read-only attribute that reflects the provider region.",
|
"region": "The resource region. If not defined, the provider region is used.",
|
||||||
}
|
}
|
||||||
|
|
||||||
resp.Schema = schema.Schema{
|
resp.Schema = schema.Schema{
|
||||||
|
|
@ -116,8 +116,7 @@ func (r *credentialDataSource) Schema(_ context.Context, _ datasource.SchemaRequ
|
||||||
},
|
},
|
||||||
"region": schema.StringAttribute{
|
"region": schema.StringAttribute{
|
||||||
// the region cannot be found automatically, so it has to be passed
|
// the region cannot be found automatically, so it has to be passed
|
||||||
Optional: false,
|
Optional: true,
|
||||||
Computed: true,
|
|
||||||
Description: descriptions["region"],
|
Description: descriptions["region"],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
@ -138,7 +137,7 @@ func (r *credentialDataSource) Read(ctx context.Context, req datasource.ReadRequ
|
||||||
credentialId := model.CredentialId.ValueString()
|
credentialId := model.CredentialId.ValueString()
|
||||||
var region string
|
var region string
|
||||||
if utils.IsUndefined(model.Region) {
|
if utils.IsUndefined(model.Region) {
|
||||||
region = r.providerData.Region
|
region = r.providerData.GetRegion()
|
||||||
} else {
|
} else {
|
||||||
region = model.Region.ValueString()
|
region = model.Region.ValueString()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -87,7 +87,7 @@ func (r *credentialResource) modifyPlanRegion(ctx context.Context, req *resource
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
utils.AdaptRegion(ctx, configModel.Region, &planModel.Region, r.providerData.Region, resp)
|
utils.AdaptRegion(ctx, configModel.Region, &planModel.Region, r.providerData.GetRegion(), resp)
|
||||||
if resp.Diagnostics.HasError() {
|
if resp.Diagnostics.HasError() {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
@ -176,7 +176,7 @@ func (r *credentialResource) Schema(_ context.Context, _ resource.SchemaRequest,
|
||||||
"credentials_group_id": "The credential group ID.",
|
"credentials_group_id": "The credential group ID.",
|
||||||
"project_id": "STACKIT Project ID to which the credential group is associated.",
|
"project_id": "STACKIT Project ID to which the credential group is associated.",
|
||||||
"expiration_timestamp": "Expiration timestamp, in RFC339 format without fractional seconds. Example: \"2025-01-01T00:00:00Z\". If not set, the credential never expires.",
|
"expiration_timestamp": "Expiration timestamp, in RFC339 format without fractional seconds. Example: \"2025-01-01T00:00:00Z\". If not set, the credential never expires.",
|
||||||
"region": "The resource region. Read-only attribute that reflects the provider region.",
|
"region": "The resource region. If not defined, the provider region is used.",
|
||||||
}
|
}
|
||||||
|
|
||||||
resp.Schema = schema.Schema{
|
resp.Schema = schema.Schema{
|
||||||
|
|
@ -246,7 +246,7 @@ func (r *credentialResource) Schema(_ context.Context, _ resource.SchemaRequest,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
"region": schema.StringAttribute{
|
"region": schema.StringAttribute{
|
||||||
Optional: false,
|
Optional: true,
|
||||||
// must be computed to allow for storing the override value from the provider
|
// must be computed to allow for storing the override value from the provider
|
||||||
Computed: true,
|
Computed: true,
|
||||||
Description: descriptions["region"],
|
Description: descriptions["region"],
|
||||||
|
|
@ -349,7 +349,7 @@ func (r *credentialResource) Read(ctx context.Context, req resource.ReadRequest,
|
||||||
credentialId := model.CredentialId.ValueString()
|
credentialId := model.CredentialId.ValueString()
|
||||||
region := model.Region.ValueString()
|
region := model.Region.ValueString()
|
||||||
if region == "" {
|
if region == "" {
|
||||||
region = r.providerData.Region
|
region = r.providerData.GetRegion()
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx = tflog.SetField(ctx, "project_id", projectId)
|
ctx = tflog.SetField(ctx, "project_id", projectId)
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,7 @@ func (r *credentialsGroupDataSource) Schema(_ context.Context, _ datasource.Sche
|
||||||
"name": "The credentials group's display name.",
|
"name": "The credentials group's display name.",
|
||||||
"project_id": "Object Storage Project ID to which the credentials group is associated.",
|
"project_id": "Object Storage Project ID to which the credentials group is associated.",
|
||||||
"urn": "Credentials group uniform resource name (URN)",
|
"urn": "Credentials group uniform resource name (URN)",
|
||||||
"region": "The resource region. Read-only attribute that reflects the provider region.",
|
"region": "The resource region. If not defined, the provider region is used.",
|
||||||
}
|
}
|
||||||
|
|
||||||
resp.Schema = schema.Schema{
|
resp.Schema = schema.Schema{
|
||||||
|
|
@ -117,8 +117,7 @@ func (r *credentialsGroupDataSource) Schema(_ context.Context, _ datasource.Sche
|
||||||
},
|
},
|
||||||
"region": schema.StringAttribute{
|
"region": schema.StringAttribute{
|
||||||
// the region cannot be found automatically, so it has to be passed
|
// the region cannot be found automatically, so it has to be passed
|
||||||
Optional: false,
|
Optional: true,
|
||||||
Computed: true,
|
|
||||||
Description: descriptions["region"],
|
Description: descriptions["region"],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
@ -137,7 +136,7 @@ func (r *credentialsGroupDataSource) Read(ctx context.Context, req datasource.Re
|
||||||
credentialsGroupId := model.CredentialsGroupId.ValueString()
|
credentialsGroupId := model.CredentialsGroupId.ValueString()
|
||||||
var region string
|
var region string
|
||||||
if utils.IsUndefined(model.Region) {
|
if utils.IsUndefined(model.Region) {
|
||||||
region = r.providerData.Region
|
region = r.providerData.GetRegion()
|
||||||
} else {
|
} else {
|
||||||
region = model.Region.ValueString()
|
region = model.Region.ValueString()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -71,7 +71,7 @@ func (r *credentialsGroupResource) ModifyPlan(ctx context.Context, req resource.
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
coreutils.AdaptRegion(ctx, configModel.Region, &planModel.Region, r.providerData.Region, resp)
|
coreutils.AdaptRegion(ctx, configModel.Region, &planModel.Region, r.providerData.GetRegion(), resp)
|
||||||
if resp.Diagnostics.HasError() {
|
if resp.Diagnostics.HasError() {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
@ -132,7 +132,7 @@ func (r *credentialsGroupResource) Schema(_ context.Context, _ resource.SchemaRe
|
||||||
"name": "The credentials group's display name.",
|
"name": "The credentials group's display name.",
|
||||||
"project_id": "Project ID to which the credentials group is associated.",
|
"project_id": "Project ID to which the credentials group is associated.",
|
||||||
"urn": "Credentials group uniform resource name (URN)",
|
"urn": "Credentials group uniform resource name (URN)",
|
||||||
"region": "The resource region. Read-only attribute that reflects the provider region.",
|
"region": "The resource region. If not defined, the provider region is used.",
|
||||||
}
|
}
|
||||||
|
|
||||||
resp.Schema = schema.Schema{
|
resp.Schema = schema.Schema{
|
||||||
|
|
@ -174,7 +174,7 @@ func (r *credentialsGroupResource) Schema(_ context.Context, _ resource.SchemaRe
|
||||||
Computed: true,
|
Computed: true,
|
||||||
},
|
},
|
||||||
"region": schema.StringAttribute{
|
"region": schema.StringAttribute{
|
||||||
Optional: false,
|
Optional: true,
|
||||||
// must be computed to allow for storing the override value from the provider
|
// must be computed to allow for storing the override value from the provider
|
||||||
Computed: true,
|
Computed: true,
|
||||||
Description: descriptions["region"],
|
Description: descriptions["region"],
|
||||||
|
|
@ -250,7 +250,7 @@ func (r *credentialsGroupResource) Read(ctx context.Context, req resource.ReadRe
|
||||||
ctx = tflog.SetField(ctx, "credentials_group_id", credentialsGroupId)
|
ctx = tflog.SetField(ctx, "credentials_group_id", credentialsGroupId)
|
||||||
ctx = tflog.SetField(ctx, "region", region)
|
ctx = tflog.SetField(ctx, "region", region)
|
||||||
if region == "" {
|
if region == "" {
|
||||||
region = r.providerData.Region
|
region = r.providerData.GetRegion()
|
||||||
}
|
}
|
||||||
|
|
||||||
found, err := readCredentialsGroups(ctx, &model, region, r.client)
|
found, err := readCredentialsGroups(ctx, &model, region, r.client)
|
||||||
|
|
|
||||||
|
|
@ -75,7 +75,7 @@ func (r *credentialResource) Configure(ctx context.Context, req resource.Configu
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = observability.NewAPIClient(
|
apiClient, err = observability.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ func (d *instanceDataSource) Configure(ctx context.Context, req datasource.Confi
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = observability.NewAPIClient(
|
apiClient, err = observability.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -364,7 +364,7 @@ func (r *instanceResource) Configure(ctx context.Context, req resource.Configure
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = observability.NewAPIClient(
|
apiClient, err = observability.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ func (d *scrapeConfigDataSource) Configure(ctx context.Context, req datasource.C
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = observability.NewAPIClient(
|
apiClient, err = observability.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
||||||
|
|
@ -139,7 +139,7 @@ func (r *scrapeConfigResource) Configure(ctx context.Context, req resource.Confi
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = observability.NewAPIClient(
|
apiClient, err = observability.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ func (r *credentialDataSource) Configure(ctx context.Context, req datasource.Con
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = opensearch.NewAPIClient(
|
apiClient, err = opensearch.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,7 @@ func (r *credentialResource) Configure(ctx context.Context, req resource.Configu
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = opensearch.NewAPIClient(
|
apiClient, err = opensearch.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ func (r *instanceDataSource) Configure(ctx context.Context, req datasource.Confi
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = opensearch.NewAPIClient(
|
apiClient, err = opensearch.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -125,7 +125,7 @@ func (r *instanceResource) Configure(ctx context.Context, req resource.Configure
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = opensearch.NewAPIClient(
|
apiClient, err = opensearch.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ func (r *databaseDataSource) Configure(ctx context.Context, req datasource.Confi
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = postgresflex.NewAPIClient(
|
apiClient, err = postgresflex.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ func (r *databaseResource) Configure(ctx context.Context, req resource.Configure
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = postgresflex.NewAPIClient(
|
apiClient, err = postgresflex.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ func (r *instanceDataSource) Configure(ctx context.Context, req datasource.Confi
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = postgresflex.NewAPIClient(
|
apiClient, err = postgresflex.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -117,7 +117,7 @@ func (r *instanceResource) Configure(ctx context.Context, req resource.Configure
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = postgresflex.NewAPIClient(
|
apiClient, err = postgresflex.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ func (r *userDataSource) Configure(ctx context.Context, req datasource.Configure
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = postgresflex.NewAPIClient(
|
apiClient, err = postgresflex.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -87,7 +87,7 @@ func (r *userResource) Configure(ctx context.Context, req resource.ConfigureRequ
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = postgresflex.NewAPIClient(
|
apiClient, err = postgresflex.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ func (r *credentialDataSource) Configure(ctx context.Context, req datasource.Con
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = rabbitmq.NewAPIClient(
|
apiClient, err = rabbitmq.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,7 @@ func (r *credentialResource) Configure(ctx context.Context, req resource.Configu
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = rabbitmq.NewAPIClient(
|
apiClient, err = rabbitmq.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ func (r *instanceDataSource) Configure(ctx context.Context, req datasource.Confi
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = rabbitmq.NewAPIClient(
|
apiClient, err = rabbitmq.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -122,7 +122,7 @@ func (r *instanceResource) Configure(ctx context.Context, req resource.Configure
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = rabbitmq.NewAPIClient(
|
apiClient, err = rabbitmq.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ func (r *credentialDataSource) Configure(ctx context.Context, req datasource.Con
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = redis.NewAPIClient(
|
apiClient, err = redis.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -83,7 +83,7 @@ func (r *credentialResource) Configure(ctx context.Context, req resource.Configu
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = redis.NewAPIClient(
|
apiClient, err = redis.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ func (r *instanceDataSource) Configure(ctx context.Context, req datasource.Confi
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = redis.NewAPIClient(
|
apiClient, err = redis.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -141,7 +141,7 @@ func (r *instanceResource) Configure(ctx context.Context, req resource.Configure
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = redis.NewAPIClient(
|
apiClient, err = redis.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ func (r *instanceDataSource) Configure(ctx context.Context, req datasource.Confi
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = secretsmanager.NewAPIClient(
|
apiClient, err = secretsmanager.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,7 @@ func (r *instanceResource) Configure(ctx context.Context, req resource.Configure
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = secretsmanager.NewAPIClient(
|
apiClient, err = secretsmanager.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,7 @@ func (r *userDataSource) Configure(ctx context.Context, req datasource.Configure
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = secretsmanager.NewAPIClient(
|
apiClient, err = secretsmanager.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,7 @@ func (r *userResource) Configure(ctx context.Context, req resource.ConfigureRequ
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = secretsmanager.NewAPIClient(
|
apiClient, err = secretsmanager.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,7 @@ func (r *scheduleResource) Configure(ctx context.Context, req resource.Configure
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = serverbackup.NewAPIClient(
|
apiClient, err = serverbackup.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -78,7 +78,7 @@ func (r *scheduleDataSource) Configure(ctx context.Context, req datasource.Confi
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = serverbackup.NewAPIClient(
|
apiClient, err = serverbackup.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ func (r *schedulesDataSource) Configure(ctx context.Context, req datasource.Conf
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = serverbackup.NewAPIClient(
|
apiClient, err = serverbackup.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -99,7 +99,7 @@ func (r *scheduleResource) Configure(ctx context.Context, req resource.Configure
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = serverupdate.NewAPIClient(
|
apiClient, err = serverupdate.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ func (r *scheduleDataSource) Configure(ctx context.Context, req datasource.Confi
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = serverupdate.NewAPIClient(
|
apiClient, err = serverupdate.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ func (r *schedulesDataSource) Configure(ctx context.Context, req datasource.Conf
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = serverupdate.NewAPIClient(
|
apiClient, err = serverupdate.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -60,7 +60,7 @@ func (r *clusterDataSource) Configure(ctx context.Context, req datasource.Config
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = ske.NewAPIClient(
|
apiClient, err = ske.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -267,7 +267,7 @@ func (r *clusterResource) Configure(ctx context.Context, req resource.ConfigureR
|
||||||
} else {
|
} else {
|
||||||
skeClient, err = ske.NewAPIClient(
|
skeClient, err = ske.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -284,7 +284,7 @@ func (r *clusterResource) Configure(ctx context.Context, req resource.ConfigureR
|
||||||
} else {
|
} else {
|
||||||
enablementClient, err = serviceenablement.NewAPIClient(
|
enablementClient, err = serviceenablement.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,7 @@ func (r *kubeconfigResource) Configure(ctx context.Context, req resource.Configu
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = ske.NewAPIClient(
|
apiClient, err = ske.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -62,7 +62,7 @@ func (r *projectDataSource) Configure(ctx context.Context, req datasource.Config
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = ske.NewAPIClient(
|
apiClient, err = ske.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -79,7 +79,7 @@ func (r *projectDataSource) Configure(ctx context.Context, req datasource.Config
|
||||||
} else {
|
} else {
|
||||||
enablementClient, err = serviceenablement.NewAPIClient(
|
enablementClient, err = serviceenablement.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ func (r *projectResource) Configure(ctx context.Context, req resource.ConfigureR
|
||||||
} else {
|
} else {
|
||||||
apiClient, err = ske.NewAPIClient(
|
apiClient, err = ske.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -91,7 +91,7 @@ func (r *projectResource) Configure(ctx context.Context, req resource.ConfigureR
|
||||||
} else {
|
} else {
|
||||||
enablementClient, err = serviceenablement.NewAPIClient(
|
enablementClient, err = serviceenablement.NewAPIClient(
|
||||||
config.WithCustomAuth(providerData.RoundTripper),
|
config.WithCustomAuth(providerData.RoundTripper),
|
||||||
config.WithRegion(providerData.Region),
|
config.WithRegion(providerData.GetRegion()),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue