diff --git a/mmv1/products/servicedirectory/terraform.yaml b/mmv1/products/servicedirectory/terraform.yaml index 343b1d128ee8..a8384b94e3a1 100644 --- a/mmv1/products/servicedirectory/terraform.yaml +++ b/mmv1/products/servicedirectory/terraform.yaml @@ -15,6 +15,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides Namespace: !ruby/object:Overrides::Terraform::ResourceOverride import_format: ["projects/{{project}}/locations/{{location}}/namespaces/{{namespace_id}}"] + skip_sweeper: true examples: - !ruby/object:Provider::Terraform::Examples name: "service_directory_namespace_basic" @@ -32,6 +33,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides custom_import: templates/terraform/custom_import/service_directory_namespace.go.erb Service: !ruby/object:Overrides::Terraform::ResourceOverride import_format: ["projects/{{project}}/locations/{{location}}/namespaces/{{namespace_id}}/services/{{service_id}}"] + skip_sweeper: true examples: - !ruby/object:Provider::Terraform::Examples name: "service_directory_service_basic" @@ -49,6 +51,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides custom_code: !ruby/object:Provider::Terraform::CustomCode custom_import: templates/terraform/custom_import/service_directory_service.go.erb Endpoint: !ruby/object:Overrides::Terraform::ResourceOverride + skip_sweeper: true import_format: ["projects/{{project}}/locations/{{location}}/namespaces/{{namespace_id}}/services/{{service_id}}/endpoints/{{endpoint_id}}"] examples: - !ruby/object:Provider::Terraform::Examples diff --git a/mmv1/third_party/terraform/resources/resource_storage_transfer_job.go b/mmv1/third_party/terraform/resources/resource_storage_transfer_job.go index 353313a770b4..4da02abf729a 100644 --- a/mmv1/third_party/terraform/resources/resource_storage_transfer_job.go +++ b/mmv1/third_party/terraform/resources/resource_storage_transfer_job.go @@ -843,15 +843,11 @@ func expandAzureBlobStorageData(azureBlobStorageDatas []interface{}) *storagetra azureBlobStorageData := azureBlobStorageDatas[0].(map[string]interface{}) - if azureBlobStorageData["sas_token"] == nil { - log.Printf("[DEBUG] sas_token is not found") - return nil - } return &storagetransfer.AzureBlobStorageData{ Container: azureBlobStorageData["container"].(string), Path: azureBlobStorageData["path"].(string), StorageAccount: azureBlobStorageData["storage_account"].(string), - AzureCredentials: expandAzureCredentials(azureBlobStorageData["sas_token"].([]interface{})), + AzureCredentials: expandAzureCredentials(azureBlobStorageData["azure_credentials"].([]interface{})), } } diff --git a/tpgtools/overrides/assuredworkloads/beta/workload.yaml b/tpgtools/overrides/assuredworkloads/beta/workload.yaml index e69de29bb2d1..9ce9afcb576c 100644 --- a/tpgtools/overrides/assuredworkloads/beta/workload.yaml +++ b/tpgtools/overrides/assuredworkloads/beta/workload.yaml @@ -0,0 +1 @@ +- type: NO_SWEEPER \ No newline at end of file diff --git a/tpgtools/overrides/assuredworkloads/workload.yaml b/tpgtools/overrides/assuredworkloads/workload.yaml index e69de29bb2d1..9ce9afcb576c 100644 --- a/tpgtools/overrides/assuredworkloads/workload.yaml +++ b/tpgtools/overrides/assuredworkloads/workload.yaml @@ -0,0 +1 @@ +- type: NO_SWEEPER \ No newline at end of file