Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Storage transfer sas #5006

Merged
merged 4 commits into from
Jul 29, 2021
Merged

Storage transfer sas #5006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d4e8941
Fix incorrect nested object reference
slevenick Jul 28, 2021
b396071
Skip sweepers
slevenick Jul 28, 2021
37f4c92
Remove assuredworkloads sweeper
slevenick Jul 28, 2021
30d72bf
Remove extra code
slevenick Jul 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions mmv1/products/servicedirectory/terraform.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand All @@ -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
Expand Down
6 changes: 1 addition & 5 deletions mmv1/third_party/terraform/resources/resource_storage_transfer_job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{})),
}
}

Expand Down
1 change: 1 addition & 0 deletions tpgtools/overrides/assuredworkloads/beta/workload.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- type: NO_SWEEPER
1 change: 1 addition & 0 deletions tpgtools/overrides/assuredworkloads/workload.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
- type: NO_SWEEPER