-
Notifications
You must be signed in to change notification settings - Fork 41
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add resources for Cloud Logging default settings (#9409) (#1791)
* Add folder and organization setting resources * Try GetTestOrgTargetFromEnv instead of GetTestOrgFromEnv. * Use correct organization for testing. * Remove key rotation to fix VCR test. * Don't specify fields matching default values. * Specify true instead of yes. * Use BootstrapKMSKeyInLocation instead of creating new keys. * Add missing quotes * Add additional examples to generate additional tests. * Remove unneeded resources from examples. * Simplify tests to be one full resource creation and one update. * Fix typo in test * Document and cleanup example. [upstream:5e89b3b459087978b89d3405bd4821d9af1436f3] Signed-off-by: Modular Magician <[email protected]>
- Loading branch information
1 parent
47f662e
commit 62e777e
Showing
4 changed files
with
181 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 89 additions & 0 deletions
89
tfplan2cai/converters/google/resources/services/logging/logging_folder_settings.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| // ---------------------------------------------------------------------------- | ||
| // | ||
| // *** AUTO GENERATED CODE *** Type: MMv1 *** | ||
| // | ||
| // ---------------------------------------------------------------------------- | ||
| // | ||
| // This file is automatically generated by Magic Modules and manual | ||
| // changes will be clobbered when the file is regenerated. | ||
| // | ||
| // Please read more about how to change this file in | ||
| // .github/CONTRIBUTING.md. | ||
| // | ||
| // ---------------------------------------------------------------------------- | ||
|
|
||
| package logging | ||
|
|
||
| import ( | ||
| "reflect" | ||
|
|
||
| "github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/converters/google/resources/cai" | ||
| "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" | ||
| transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" | ||
| ) | ||
|
|
||
| const LoggingFolderSettingsAssetType string = "logging.googleapis.com/FolderSettings" | ||
|
|
||
| func ResourceConverterLoggingFolderSettings() cai.ResourceConverter { | ||
| return cai.ResourceConverter{ | ||
| AssetType: LoggingFolderSettingsAssetType, | ||
| Convert: GetLoggingFolderSettingsCaiObject, | ||
| } | ||
| } | ||
|
|
||
| func GetLoggingFolderSettingsCaiObject(d tpgresource.TerraformResourceData, config *transport_tpg.Config) ([]cai.Asset, error) { | ||
| name, err := cai.AssetName(d, config, "//logging.googleapis.com/folders/{{folder}}/settings") | ||
| if err != nil { | ||
| return []cai.Asset{}, err | ||
| } | ||
| if obj, err := GetLoggingFolderSettingsApiObject(d, config); err == nil { | ||
| return []cai.Asset{{ | ||
| Name: name, | ||
| Type: LoggingFolderSettingsAssetType, | ||
| Resource: &cai.AssetResource{ | ||
| Version: "v2", | ||
| DiscoveryDocumentURI: "https://www.googleapis.com/discovery/v1/apis/logging/v2/rest", | ||
| DiscoveryName: "FolderSettings", | ||
| Data: obj, | ||
| }, | ||
| }}, nil | ||
| } else { | ||
| return []cai.Asset{}, err | ||
| } | ||
| } | ||
|
|
||
| func GetLoggingFolderSettingsApiObject(d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]interface{}, error) { | ||
| obj := make(map[string]interface{}) | ||
| kmsKeyNameProp, err := expandLoggingFolderSettingsKmsKeyName(d.Get("kms_key_name"), d, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if v, ok := d.GetOkExists("kms_key_name"); !tpgresource.IsEmptyValue(reflect.ValueOf(kmsKeyNameProp)) && (ok || !reflect.DeepEqual(v, kmsKeyNameProp)) { | ||
| obj["kmsKeyName"] = kmsKeyNameProp | ||
| } | ||
| storageLocationProp, err := expandLoggingFolderSettingsStorageLocation(d.Get("storage_location"), d, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if v, ok := d.GetOkExists("storage_location"); !tpgresource.IsEmptyValue(reflect.ValueOf(storageLocationProp)) && (ok || !reflect.DeepEqual(v, storageLocationProp)) { | ||
| obj["storageLocation"] = storageLocationProp | ||
| } | ||
| disableDefaultSinkProp, err := expandLoggingFolderSettingsDisableDefaultSink(d.Get("disable_default_sink"), d, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if v, ok := d.GetOkExists("disable_default_sink"); !tpgresource.IsEmptyValue(reflect.ValueOf(disableDefaultSinkProp)) && (ok || !reflect.DeepEqual(v, disableDefaultSinkProp)) { | ||
| obj["disableDefaultSink"] = disableDefaultSinkProp | ||
| } | ||
|
|
||
| return obj, nil | ||
| } | ||
|
|
||
| func expandLoggingFolderSettingsKmsKeyName(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) { | ||
| return v, nil | ||
| } | ||
|
|
||
| func expandLoggingFolderSettingsStorageLocation(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) { | ||
| return v, nil | ||
| } | ||
|
|
||
| func expandLoggingFolderSettingsDisableDefaultSink(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) { | ||
| return v, nil | ||
| } |
89 changes: 89 additions & 0 deletions
89
tfplan2cai/converters/google/resources/services/logging/logging_organization_settings.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| // ---------------------------------------------------------------------------- | ||
| // | ||
| // *** AUTO GENERATED CODE *** Type: MMv1 *** | ||
| // | ||
| // ---------------------------------------------------------------------------- | ||
| // | ||
| // This file is automatically generated by Magic Modules and manual | ||
| // changes will be clobbered when the file is regenerated. | ||
| // | ||
| // Please read more about how to change this file in | ||
| // .github/CONTRIBUTING.md. | ||
| // | ||
| // ---------------------------------------------------------------------------- | ||
|
|
||
| package logging | ||
|
|
||
| import ( | ||
| "reflect" | ||
|
|
||
| "github.com/GoogleCloudPlatform/terraform-google-conversion/v5/tfplan2cai/converters/google/resources/cai" | ||
| "github.com/hashicorp/terraform-provider-google-beta/google-beta/tpgresource" | ||
| transport_tpg "github.com/hashicorp/terraform-provider-google-beta/google-beta/transport" | ||
| ) | ||
|
|
||
| const LoggingOrganizationSettingsAssetType string = "logging.googleapis.com/OrganizationSettings" | ||
|
|
||
| func ResourceConverterLoggingOrganizationSettings() cai.ResourceConverter { | ||
| return cai.ResourceConverter{ | ||
| AssetType: LoggingOrganizationSettingsAssetType, | ||
| Convert: GetLoggingOrganizationSettingsCaiObject, | ||
| } | ||
| } | ||
|
|
||
| func GetLoggingOrganizationSettingsCaiObject(d tpgresource.TerraformResourceData, config *transport_tpg.Config) ([]cai.Asset, error) { | ||
| name, err := cai.AssetName(d, config, "//logging.googleapis.com/organizations/{{organization}}/settings") | ||
| if err != nil { | ||
| return []cai.Asset{}, err | ||
| } | ||
| if obj, err := GetLoggingOrganizationSettingsApiObject(d, config); err == nil { | ||
| return []cai.Asset{{ | ||
| Name: name, | ||
| Type: LoggingOrganizationSettingsAssetType, | ||
| Resource: &cai.AssetResource{ | ||
| Version: "v2", | ||
| DiscoveryDocumentURI: "https://www.googleapis.com/discovery/v1/apis/logging/v2/rest", | ||
| DiscoveryName: "OrganizationSettings", | ||
| Data: obj, | ||
| }, | ||
| }}, nil | ||
| } else { | ||
| return []cai.Asset{}, err | ||
| } | ||
| } | ||
|
|
||
| func GetLoggingOrganizationSettingsApiObject(d tpgresource.TerraformResourceData, config *transport_tpg.Config) (map[string]interface{}, error) { | ||
| obj := make(map[string]interface{}) | ||
| kmsKeyNameProp, err := expandLoggingOrganizationSettingsKmsKeyName(d.Get("kms_key_name"), d, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if v, ok := d.GetOkExists("kms_key_name"); !tpgresource.IsEmptyValue(reflect.ValueOf(kmsKeyNameProp)) && (ok || !reflect.DeepEqual(v, kmsKeyNameProp)) { | ||
| obj["kmsKeyName"] = kmsKeyNameProp | ||
| } | ||
| storageLocationProp, err := expandLoggingOrganizationSettingsStorageLocation(d.Get("storage_location"), d, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if v, ok := d.GetOkExists("storage_location"); !tpgresource.IsEmptyValue(reflect.ValueOf(storageLocationProp)) && (ok || !reflect.DeepEqual(v, storageLocationProp)) { | ||
| obj["storageLocation"] = storageLocationProp | ||
| } | ||
| disableDefaultSinkProp, err := expandLoggingOrganizationSettingsDisableDefaultSink(d.Get("disable_default_sink"), d, config) | ||
| if err != nil { | ||
| return nil, err | ||
| } else if v, ok := d.GetOkExists("disable_default_sink"); !tpgresource.IsEmptyValue(reflect.ValueOf(disableDefaultSinkProp)) && (ok || !reflect.DeepEqual(v, disableDefaultSinkProp)) { | ||
| obj["disableDefaultSink"] = disableDefaultSinkProp | ||
| } | ||
|
|
||
| return obj, nil | ||
| } | ||
|
|
||
| func expandLoggingOrganizationSettingsKmsKeyName(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) { | ||
| return v, nil | ||
| } | ||
|
|
||
| func expandLoggingOrganizationSettingsStorageLocation(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) { | ||
| return v, nil | ||
| } | ||
|
|
||
| func expandLoggingOrganizationSettingsDisableDefaultSink(v interface{}, d tpgresource.TerraformResourceData, config *transport_tpg.Config) (interface{}, error) { | ||
| return v, nil | ||
| } |