diff --git a/CHANGELOG.md b/CHANGELOG.md index 8940c863d2..9d9744e0d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,42 @@ +# 1.70.0-beta0(Sep 22, 2024) + +Breaking Changes +* update(cloud-databases): Make Service Endpoints as Required argument([5615](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/5615)) + +Features +* Support IAM Access tag + - **Resources** + - ibm_iam_access_tag +* Support VPC + - **Resources** + - ibm_is_subnet_reserved_ip_patch +* Support code Engine + - **Resources** + - ibm_code_engine_function + +Enhancements +* add service_to_service_enabled field to atracker event streams endpoint ([5605](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/5605)) +* Deprecated ibm_resource_access_tag and replaced it with ibm_iam_access_tag ([5567](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/5567)) +* SM New error formatting + crypto_key label name changes ([5562](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/5562)) +* Deprecating alias and bindings APIs and schema items ([5612](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/5612)) +* update(cloud-databases): Make Service Endpoints Required and send warning when public endpoints are in use ([5402](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/5402)) +* discourage use of ibm_container_bind_service ([5588](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/5588)) +* updated resources, data source and documentation for Slack Direct destination support ([5615](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/5615)) +* IAM Policy Assignment: S2S Policy Assignments ET and AG ([5624](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/5624)) +* fix for context and history parameter of template assignment ([5640](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/5640)) +* Updating to latest schematics sdk and updating sch_agent resource to enable force deletion by default ([5660](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/5660)) +* add support for 4th zone ([5644](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/5644)) + +BugFixes +* The ibm_resource_tag do not detach if tag_type is access or service ([5566](https://github.com/IBM-Cloud/terraform-provider-ibm/issues/5566)) +* fix(is_share): added empty check and moved source_share_crn outside ([5632](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/5632)) +* Add test bucket endpoints ([5636](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/5636)) +* The ibm_resource_tag does not check the response on api tags calls ([5641](https://github.com/IBM-Cloud/terraform-provider-ibm/issues/5641)) + +# 1.69.2(Sep 13, 2024) +* Add region parameter to logs-routing resources and data sources ([5634](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/5634)) +* fix(is_share): added empty check and moved source_share_crn outside ([5632](https://github.com/IBM-Cloud/terraform-provider-ibm/pull/5632)) + # 1.69.1(Sep 10, 2024) BugFixes * BUG: 1.69.0 panic when attempting to update ibm_resource_instance ([5618](https://github.com/IBM-Cloud/terraform-provider-ibm/issues/5618)) diff --git a/go.mod b/go.mod index a6ef2a413c..a784b178ad 100644 --- a/go.mod +++ b/go.mod @@ -35,11 +35,11 @@ require ( github.com/IBM/push-notifications-go-sdk v0.0.0-20210310100607-5790b96c47f5 github.com/IBM/sarama v1.41.2 github.com/IBM/scc-go-sdk/v5 v5.4.1 - github.com/IBM/schematics-go-sdk v0.2.3 + github.com/IBM/schematics-go-sdk v0.3.0 github.com/IBM/secrets-manager-go-sdk/v2 v2.0.6 github.com/IBM/vmware-go-sdk v0.1.2 github.com/IBM/vpc-beta-go-sdk v0.6.0 - github.com/IBM/vpc-go-sdk v0.57.0 + github.com/IBM/vpc-go-sdk v0.58.0 github.com/ScaleFT/sshkeys v0.0.0-20200327173127-6142f742bca5 github.com/akamai/AkamaiOPEN-edgegrid-golang v1.2.2 github.com/akamai/AkamaiOPEN-edgegrid-golang/v5 v5.0.0 diff --git a/go.sum b/go.sum index 9608c2c7cb..6e1a9cdfea 100644 --- a/go.sum +++ b/go.sum @@ -183,16 +183,16 @@ github.com/IBM/sarama v1.41.2 h1:ZDBZfGPHAD4uuAtSv4U22fRZBgst0eEwGFzLj0fb85c= github.com/IBM/sarama v1.41.2/go.mod h1:xdpu7sd6OE1uxNdjYTSKUfY8FaKkJES9/+EyjSgiGQk= github.com/IBM/scc-go-sdk/v5 v5.4.1 h1:RXIuxOo9/hxkWyHCI69ae+KIJgSbXcAkJwTEl+fO3LQ= github.com/IBM/scc-go-sdk/v5 v5.4.1/go.mod h1:2xQTDgNXG5QMEfQxBDKB067z+5ha6OgcaKCTcdGDAo8= -github.com/IBM/schematics-go-sdk v0.2.3 h1:lgTt0Sbudii3cuSk1YSQgrtiZAXDbBABAoVj3eQuBrU= -github.com/IBM/schematics-go-sdk v0.2.3/go.mod h1:Tw2OSAPdpC69AxcwoyqcYYaGTTW6YpERF9uNEU+BFRQ= +github.com/IBM/schematics-go-sdk v0.3.0 h1:Vwxw85SONflakiBsNHAfViKLyp9zJiH5/hh6SewOP5Q= +github.com/IBM/schematics-go-sdk v0.3.0/go.mod h1:Tw2OSAPdpC69AxcwoyqcYYaGTTW6YpERF9uNEU+BFRQ= github.com/IBM/secrets-manager-go-sdk/v2 v2.0.6 h1:bF6bAdI4wDZSje6+Yx1mJxvirboxO+uMuKhzgfRCNxE= github.com/IBM/secrets-manager-go-sdk/v2 v2.0.6/go.mod h1:XWYnbcc5vN1RnKwk/fCzfD8aZd7At/Y1/b6c+oDyliU= github.com/IBM/vmware-go-sdk v0.1.2 h1:5lKWFyInWz9e2hwGsoFTEoLa1jYkD30SReN0fQ10w9M= github.com/IBM/vmware-go-sdk v0.1.2/go.mod h1:2UGPBJju3jiv5VKKBBm9a5L6bzF/aJdKOKAzJ7HaOjA= github.com/IBM/vpc-beta-go-sdk v0.6.0 h1:wfM3AcW3zOM3xsRtZ+EA6+sESlGUjQ6Yf4n5QQyz4uc= github.com/IBM/vpc-beta-go-sdk v0.6.0/go.mod h1:fzHDAQIqH/5yJmYsKodKHLcqxMDT+yfH6vZjdiw8CQA= -github.com/IBM/vpc-go-sdk v0.57.0 h1:E8CPDpUE4z0cvvmFZzqUthMtGJx71Fne6vdvkjZdXfg= -github.com/IBM/vpc-go-sdk v0.57.0/go.mod h1:swmxiYLT+OfBsBYqJWGeRd6NPmBk4u/het2PZdtzIaw= +github.com/IBM/vpc-go-sdk v0.58.0 h1:Slk1jkcV7tPnf0iECQV2Oja7W8Bom0z7k9M4fMBY4bI= +github.com/IBM/vpc-go-sdk v0.58.0/go.mod h1:swmxiYLT+OfBsBYqJWGeRd6NPmBk4u/het2PZdtzIaw= github.com/Jeffail/gabs v1.1.1 h1:V0uzR08Hj22EX8+8QMhyI9sX2hwRu+/RJhJUmnwda/E= github.com/Jeffail/gabs v1.1.1/go.mod h1:6xMvQMK4k33lb7GUUpaAPh6nKMmemQeg5d4gn7/bOXc= github.com/Logicalis/asn1 v0.0.0-20190312173541-d60463189a56 h1:vuquMR410psHNax14XKNWa0Ae/kYgWJcXi0IFuX60N0= diff --git a/ibm/acctest/acctest.go b/ibm/acctest/acctest.go index c9ec33a9f7..6ab8596933 100644 --- a/ibm/acctest/acctest.go +++ b/ibm/acctest/acctest.go @@ -394,7 +394,7 @@ var ( // For IAM Access Management var ( - TargetAccountId string + TargetAccountId string TargetEnterpriseId string ) @@ -1875,7 +1875,6 @@ func init() { fmt.Println("[INFO] Set the environment variable IBM_POLICY_ASSIGNMENT_TARGET_ACCOUNT_ID for testing ibm_iam_policy_assignment resource else tests will fail if this is not set correctly") } - TargetEnterpriseId = os.Getenv("IBM_POLICY_ASSIGNMENT_TARGET_ENTERPRISE_ID") if TargetEnterpriseId == "" { fmt.Println("[INFO] Set the environment variable IBM_POLICY_ASSIGNMENT_TARGET_ENTERPRISE_ID for testing ibm_iam_policy_assignment resource else tests will fail if this is not set correctly") diff --git a/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_template_assignment.go b/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_template_assignment.go index ad1ae38e10..2b4a131291 100644 --- a/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_template_assignment.go +++ b/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_template_assignment.go @@ -6,10 +6,11 @@ package iamidentity import ( "context" "fmt" - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "log" "time" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -434,14 +435,16 @@ func resourceIBMTrustedProfileTemplateAssignmentRead(context context.Context, d if err = d.Set("target", templateAssignmentResponse.Target); err != nil { return diag.FromErr(fmt.Errorf("error setting target: %s", err)) } + ctx := []map[string]interface{}{} if !core.IsNil(templateAssignmentResponse.Context) { contextMap, err := resourceIBMTrustedProfileTemplateAssignmentResponseContextToMap(templateAssignmentResponse.Context) if err != nil { return diag.FromErr(err) } - if err = d.Set("context", []map[string]interface{}{contextMap}); err != nil { - return diag.FromErr(fmt.Errorf("error setting context: %s", err)) - } + ctx = append(ctx, contextMap) + } + if err = d.Set("context", ctx); err != nil { + return diag.FromErr(fmt.Errorf("[ERROR] Error setting context: %s", err)) } if err = d.Set("account_id", templateAssignmentResponse.AccountID); err != nil { return diag.FromErr(fmt.Errorf("error setting account_id: %s", err)) @@ -462,8 +465,8 @@ func resourceIBMTrustedProfileTemplateAssignmentRead(context context.Context, d return diag.FromErr(fmt.Errorf("error setting resources: %s", err)) } } + history := []map[string]interface{}{} if !core.IsNil(templateAssignmentResponse.History) { - history := []map[string]interface{}{} for _, historyItem := range templateAssignmentResponse.History { historyItemMap, err := resourceIBMTrustedProfileTemplateAssignmentEnityHistoryRecordToMap(&historyItem) if err != nil { @@ -471,9 +474,9 @@ func resourceIBMTrustedProfileTemplateAssignmentRead(context context.Context, d } history = append(history, historyItemMap) } - if err = d.Set("history", history); err != nil { - return diag.FromErr(fmt.Errorf("error setting history: %s", err)) - } + } + if err = d.Set("history", history); err != nil { + return diag.FromErr(fmt.Errorf("[ERROR] Error setting history: %s", err)) } if !core.IsNil(templateAssignmentResponse.Href) { if err = d.Set("href", templateAssignmentResponse.Href); err != nil { diff --git a/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_template_assignment_test.go b/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_template_assignment_test.go index 8ceeec507a..fa8b5887b8 100644 --- a/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_template_assignment_test.go +++ b/ibm/service/iamidentity/resource_ibm_iam_trusted_profile_template_assignment_test.go @@ -30,8 +30,8 @@ func TestAccIBMTrustedProfileTemplateAssignmentBasic(t *testing.T) { CheckDestroy: testAccCheckIBMTrustedProfileTemplateAssignmentResourceDestroy, Steps: []resource.TestStep{ { - Config: testAccCheckIBMTrustedProfileTemplateAssignmentConfigBasic(name, 1), - ExpectNonEmptyPlan: true, + + Config: testAccCheckIBMTrustedProfileTemplateAssignmentConfigBasic(name, 1), Check: resource.ComposeAggregateTestCheckFunc( testAccCheckIBMTrustedProfileTemplateAssignmentExists("ibm_iam_trusted_profile_template_assignment.trusted_profile_template_assignment_instance", conf), resource.TestCheckResourceAttrSet("ibm_iam_trusted_profile_template_assignment.trusted_profile_template_assignment_instance", "id"), @@ -54,8 +54,7 @@ func TestAccIBMTrustedProfileTemplateAssignmentBasic(t *testing.T) { Config: testAccCheckIBMTrustedProfileTemplateAssignmentConfigBasic(name, 3), }, { - ExpectNonEmptyPlan: true, - Config: testAccCheckIBMTrustedProfileTemplateAssignmentConfigBasic(name, 2), + Config: testAccCheckIBMTrustedProfileTemplateAssignmentConfigBasic(name, 2), Check: resource.ComposeAggregateTestCheckFunc( resource.TestCheckResourceAttr("ibm_iam_trusted_profile_template_assignment.trusted_profile_template_assignment_instance", "template_version", "2"), ), diff --git a/ibm/service/iampolicy/resource_ibm_iam_policy_assignment.go b/ibm/service/iampolicy/resource_ibm_iam_policy_assignment.go index 766c154505..564e450ac8 100644 --- a/ibm/service/iampolicy/resource_ibm_iam_policy_assignment.go +++ b/ibm/service/iampolicy/resource_ibm_iam_policy_assignment.go @@ -21,9 +21,9 @@ import ( ) const ( - InProgress = "in_progress" - complete = "complete" - failed = "failed" + InProgress = "in_progress" + complete = "complete" + failed = "failed" ) func ResourceIBMIAMPolicyAssignment() *schema.Resource { @@ -470,7 +470,6 @@ func resourceIBMPolicyAssignmentDelete(context context.Context, d *schema.Resour deletePolicyAssignmentOptions.SetAssignmentID(d.Id()) - response, err := iamPolicyManagementClient.DeletePolicyAssignmentWithContext(context, deletePolicyAssignmentOptions) if err != nil { if response != nil && response.StatusCode == 404 { @@ -486,7 +485,7 @@ func resourceIBMPolicyAssignmentDelete(context context.Context, d *schema.Resour if diags.HasError() { return diags } - + if targetModel.Type != nil && (*targetModel.Type == "Account") { log.Printf("[DEBUG] Skipping waitForAssignment for target type: %s", *targetModel.Type) } else { @@ -539,15 +538,14 @@ func ResourceIBMPolicyAssignmentAssignmentTemplateDetailsToMap(model *iampolicym } func GetTargetModel(d *schema.ResourceData) (*iampolicymanagementv1.AssignmentTargetDetails, diag.Diagnostics) { - targetModel, err := ResourceIBMPolicyAssignmentMapToAssignmentTargetDetails(d.Get("target").(map[string]interface{})) - - if err != nil { - return targetModel, diag.FromErr(err) - } + targetModel, err := ResourceIBMPolicyAssignmentMapToAssignmentTargetDetails(d.Get("target").(map[string]interface{})) - return targetModel, nil -} + if err != nil { + return targetModel, diag.FromErr(err) + } + return targetModel, nil +} func waitForAssignment(timeout time.Duration, meta interface{}, d *schema.ResourceData, refreshFn func(string, interface{}) resource.StateRefreshFunc) (interface{}, error) { @@ -640,7 +638,6 @@ func isAccessPolicyAssignedDeleted(id string, meta interface{}) resource.StateRe return nil, failed, fmt.Errorf("[ERROR] Type assertion failed for assignment details : %s", id) } - if assignment != nil { if *assignment.Status == "accepted" || *assignment.Status == "in_progress" { log.Printf("Assignment still in progress\n") diff --git a/ibm/service/iampolicy/resource_ibm_iam_policy_assignment_test.go b/ibm/service/iampolicy/resource_ibm_iam_policy_assignment_test.go index d6da6ad589..aa1dc86bd7 100644 --- a/ibm/service/iampolicy/resource_ibm_iam_policy_assignment_test.go +++ b/ibm/service/iampolicy/resource_ibm_iam_policy_assignment_test.go @@ -46,7 +46,6 @@ func TestAccIBMPolicyAssignmentBasic(t *testing.T) { }) } - func TestAccIBMPolicyAssignmentS2SBasic(t *testing.T) { var conf iampolicymanagementv1.GetPolicyAssignmentResponse var name string = fmt.Sprintf("TerraformTemplateTest%d", acctest.RandIntRange(10, 100)) diff --git a/ibm/service/schematics/data_source_ibm_schematics_job.go b/ibm/service/schematics/data_source_ibm_schematics_job.go index 663e3fa14b..64f35170d5 100644 --- a/ibm/service/schematics/data_source_ibm_schematics_job.go +++ b/ibm/service/schematics/data_source_ibm_schematics_job.go @@ -4212,7 +4212,7 @@ func dataSourceJobLogSummaryToMap(logSummaryItem schematicsv1.JobLogSummary) (lo return logSummaryMap } -func dataSourceJobLogSummaryLogErrorsToMap(logErrorsItem schematicsv1.JobLogSummaryLogErrorsItem) (logErrorsMap map[string]interface{}) { +func dataSourceJobLogSummaryLogErrorsToMap(logErrorsItem schematicsv1.JobLogSummaryLogErrors) (logErrorsMap map[string]interface{}) { logErrorsMap = map[string]interface{}{} if logErrorsItem.ErrorCode != nil { diff --git a/ibm/service/schematics/resource_ibm_schematics_agent.go b/ibm/service/schematics/resource_ibm_schematics_agent.go index 36f440553f..02843f1efd 100644 --- a/ibm/service/schematics/resource_ibm_schematics_agent.go +++ b/ibm/service/schematics/resource_ibm_schematics_agent.go @@ -900,7 +900,9 @@ func resourceIbmSchematicsAgentDelete(context context.Context, d *schema.Resourc return diag.FromErr(err) } - deleteAgentDataOptions := &schematicsv1.DeleteAgentDataOptions{} + deleteAgentDataOptions := &schematicsv1.DeleteAgentDataOptions{ + Force: core.BoolPtr(true), + } session, err := meta.(conns.ClientSession).BluemixSession() if err != nil { return diag.FromErr(err) diff --git a/ibm/service/schematics/resource_ibm_schematics_agent_test.go b/ibm/service/schematics/resource_ibm_schematics_agent_test.go index f5a4c6e646..3a2dd4384e 100644 --- a/ibm/service/schematics/resource_ibm_schematics_agent_test.go +++ b/ibm/service/schematics/resource_ibm_schematics_agent_test.go @@ -195,9 +195,7 @@ func testAccCheckIbmSchematicsAgentDestroy(s *terraform.State) error { // Try to find the key _, response, err := schematicsClient.GetAgentData(getAgentDataOptions) if err == nil { - return nil - // TODO: uncomment the following lines of code once the agent delete actually deletes agentdoc - // return fmt.Errorf("schematics_agent still exists: %s", rs.Primary.ID) + return fmt.Errorf("schematics_agent still exists: %s", rs.Primary.ID) } else if response.StatusCode != 404 { return fmt.Errorf("Error checking for schematics_agent (%s) has been destroyed: %s", rs.Primary.ID, err) } diff --git a/ibm/service/schematics/resource_ibm_schematics_job.go b/ibm/service/schematics/resource_ibm_schematics_job.go index b8927e5101..4893b8b7ae 100644 --- a/ibm/service/schematics/resource_ibm_schematics_job.go +++ b/ibm/service/schematics/resource_ibm_schematics_job.go @@ -3701,7 +3701,7 @@ func resourceIBMSchematicsJobMapToJobLogSummary(jobLogSummaryMap map[string]inte jobLogSummary.ElapsedTime = core.Float64Ptr(jobLogSummaryMap["elapsed_time"].(float64)) } if jobLogSummaryMap["log_errors"] != nil { - logErrors := []schematicsv1.JobLogSummaryLogErrorsItem{} + logErrors := []schematicsv1.JobLogSummaryLogErrors{} for _, logErrorsItem := range jobLogSummaryMap["log_errors"].([]interface{}) { logErrorsItemModel := resourceIBMSchematicsJobMapToJobLogSummaryLogErrors(logErrorsItem.(map[string]interface{})) logErrors = append(logErrors, logErrorsItemModel) @@ -3732,8 +3732,8 @@ func resourceIBMSchematicsJobMapToJobLogSummary(jobLogSummaryMap map[string]inte return jobLogSummary } -func resourceIBMSchematicsJobMapToJobLogSummaryLogErrors(jobLogSummaryLogErrorsMap map[string]interface{}) schematicsv1.JobLogSummaryLogErrorsItem { - jobLogSummaryLogErrors := schematicsv1.JobLogSummaryLogErrorsItem{} +func resourceIBMSchematicsJobMapToJobLogSummaryLogErrors(jobLogSummaryLogErrorsMap map[string]interface{}) schematicsv1.JobLogSummaryLogErrors { + jobLogSummaryLogErrors := schematicsv1.JobLogSummaryLogErrors{} if jobLogSummaryLogErrorsMap["error_code"] != nil { jobLogSummaryLogErrors.ErrorCode = core.StringPtr(jobLogSummaryLogErrorsMap["error_code"].(string)) @@ -4803,7 +4803,7 @@ func resourceIBMSchematicsJobJobLogSummaryToMap(jobLogSummary schematicsv1.JobLo return jobLogSummaryMap } -func resourceIBMSchematicsJobJobLogSummaryLogErrorsToMap(jobLogSummaryLogErrors schematicsv1.JobLogSummaryLogErrorsItem) map[string]interface{} { +func resourceIBMSchematicsJobJobLogSummaryLogErrorsToMap(jobLogSummaryLogErrors schematicsv1.JobLogSummaryLogErrors) map[string]interface{} { jobLogSummaryLogErrorsMap := map[string]interface{}{} if jobLogSummaryLogErrors.ErrorCode != nil { diff --git a/ibm/service/schematics/resource_ibm_schematics_workspace.go b/ibm/service/schematics/resource_ibm_schematics_workspace.go index 0853d0c7d6..bbd89ddf2f 100644 --- a/ibm/service/schematics/resource_ibm_schematics_workspace.go +++ b/ibm/service/schematics/resource_ibm_schematics_workspace.go @@ -581,7 +581,7 @@ func ResourceIBMSchematicsWorkspaceValidator() *validate.ResourceValidator { Identifier: schematicsWorkspaceTemplateType, ValidateFunctionIdentifier: validate.ValidateRegexp, Type: validate.TypeString, - Regexp: `^terraform_v(?:0\.11|0\.12|0\.13|0\.14|0\.15|1\.0|1\.1|1\.2|1\.3|1\.4|1\.5|1\.6)(?:\.\d+)?$`, + Regexp: `^terraform_v(?:1\.4|1\.5|1\.6|1\.7|1\.8|1\.9)(?:\.\d+)?$`, Default: "[]", Optional: true}) diff --git a/ibm/service/vpc/data_source_ibm_is_backup_policies.go b/ibm/service/vpc/data_source_ibm_is_backup_policies.go index 9e223abac2..b2681c4a83 100644 --- a/ibm/service/vpc/data_source_ibm_is_backup_policies.go +++ b/ibm/service/vpc/data_source_ibm_is_backup_policies.go @@ -446,7 +446,7 @@ func dataSourceBackupPolicyCollectionBackupPoliciesPlansToMap(plansItem vpcv1.Ba return plansMap } -func dataSourceBackupPolicyCollectionPlansDeletedToMap(deletedItem vpcv1.BackupPolicyPlanReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceBackupPolicyCollectionPlansDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_backup_policy.go b/ibm/service/vpc/data_source_ibm_is_backup_policy.go index 62d152f0ce..8fda012d70 100644 --- a/ibm/service/vpc/data_source_ibm_is_backup_policy.go +++ b/ibm/service/vpc/data_source_ibm_is_backup_policy.go @@ -422,7 +422,7 @@ func dataSourceBackupPolicyPlansToMap(plansItem vpcv1.BackupPolicyPlanReference) return plansMap } -func dataSourceBackupPolicyPlansDeletedToMap(deletedItem vpcv1.BackupPolicyPlanReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceBackupPolicyPlansDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_backup_policy_job.go b/ibm/service/vpc/data_source_ibm_is_backup_policy_job.go index a7aee98b28..0a2defd776 100644 --- a/ibm/service/vpc/data_source_ibm_is_backup_policy_job.go +++ b/ibm/service/vpc/data_source_ibm_is_backup_policy_job.go @@ -447,7 +447,7 @@ func dataSourceBackupPolicyJobBackupPolicyPlanToMap(backupPolicyPlanItem vpcv1.B return backupPolicyPlanMap } -func dataSourceBackupPolicyJobBackupPolicyPlanDeletedToMap(deletedItem vpcv1.BackupPolicyPlanReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceBackupPolicyJobBackupPolicyPlanDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -537,7 +537,7 @@ func resourceIBMIsBackupPolicyPlanRemoteRegionReferenceToMap(model *vpcv1.Region return modelMap, nil } -func dataSourceBackupPolicyJobSourceVolumeDeletedToMap(deletedItem vpcv1.VolumeReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceBackupPolicyJobSourceVolumeDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -578,7 +578,7 @@ func dataSourceBackupPolicyJobSourceInstanceToMap(sourceVolumeItem vpcv1.BackupP return sourceVolumeMap } -func dataSourceBackupPolicyJobSourceInstanceDeletedToMap(deletedItem vpcv1.InstanceReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceBackupPolicyJobSourceInstanceDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -650,7 +650,7 @@ func dataSourceBackupPolicyJobTargetSnapshotToMap(targetSnapshotItem vpcv1.Snaps return targetSnapshotMap } -func dataSourceBackupPolicyJobTargetSnapshotDeletedToMap(deletedItem vpcv1.SnapshotReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceBackupPolicyJobTargetSnapshotDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_backup_policy_jobs.go b/ibm/service/vpc/data_source_ibm_is_backup_policy_jobs.go index 0377373cd2..d90df6531e 100644 --- a/ibm/service/vpc/data_source_ibm_is_backup_policy_jobs.go +++ b/ibm/service/vpc/data_source_ibm_is_backup_policy_jobs.go @@ -571,7 +571,7 @@ func dataSourceBackupPolicyJobCollectionJobsBackupPolicyPlanToMap(backupPolicyPl return backupPolicyPlanMap } -func dataSourceBackupPolicyJobCollectionBackupPolicyPlanDeletedToMap(deletedItem vpcv1.BackupPolicyPlanReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceBackupPolicyJobCollectionBackupPolicyPlanDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -639,7 +639,7 @@ func dataSourceBackupPolicyJobCollectionJobsSourceInstanceToMap(sourceVolumeItem return sourceVolumeMap } -func dataSourceBackupPolicyJobCollectionSourceVolumeDeletedToMap(deletedItem vpcv1.VolumeReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceBackupPolicyJobCollectionSourceVolumeDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -648,7 +648,7 @@ func dataSourceBackupPolicyJobCollectionSourceVolumeDeletedToMap(deletedItem vpc return deletedMap } -func dataSourceBackupPolicyJobCollectionSourceInstanceDeletedToMap(deletedItem vpcv1.InstanceReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceBackupPolicyJobCollectionSourceInstanceDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -702,7 +702,7 @@ func dataSourceBackupPolicyJobCollectionJobsTargetSnapshotToMap(targetSnapshotIt return targetSnapshotMap } -func dataSourceBackupPolicyJobCollectionTargetSnapshotDeletedToMap(deletedItem vpcv1.SnapshotReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceBackupPolicyJobCollectionTargetSnapshotDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_bare_metal_server.go b/ibm/service/vpc/data_source_ibm_is_bare_metal_server.go index 87bc367cfa..529ff295df 100644 --- a/ibm/service/vpc/data_source_ibm_is_bare_metal_server.go +++ b/ibm/service/vpc/data_source_ibm_is_bare_metal_server.go @@ -1205,7 +1205,7 @@ func dataSourceIBMIsBareMetalServerVirtualNetworkInterfaceReferenceAttachmentCon return modelMap, nil } -func dataSourceIBMIsBareMetalServerBareMetalServerNetworkAttachmentReferenceDeletedToMap(model *vpcv1.BareMetalServerNetworkAttachmentReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsBareMetalServerBareMetalServerNetworkAttachmentReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -1228,7 +1228,7 @@ func dataSourceIBMIsBareMetalServerReservedIPReferenceToMap(model *vpcv1.Reserve return modelMap, nil } -func dataSourceIBMIsBareMetalServerReservedIPReferenceDeletedToMap(model *vpcv1.ReservedIPReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsBareMetalServerReservedIPReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -1251,7 +1251,7 @@ func dataSourceIBMIsBareMetalServerSubnetReferenceToMap(model *vpcv1.SubnetRefer return modelMap, nil } -func dataSourceIBMIsBareMetalServerSubnetReferenceDeletedToMap(model *vpcv1.SubnetReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsBareMetalServerSubnetReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil diff --git a/ibm/service/vpc/data_source_ibm_is_bare_metal_server_network_attachment.go b/ibm/service/vpc/data_source_ibm_is_bare_metal_server_network_attachment.go index 846656eb1e..a5ce63f9b8 100644 --- a/ibm/service/vpc/data_source_ibm_is_bare_metal_server_network_attachment.go +++ b/ibm/service/vpc/data_source_ibm_is_bare_metal_server_network_attachment.go @@ -346,7 +346,7 @@ func dataSourceIBMIsBareMetalServerNetworkAttachmentReservedIPReferenceToMap(mod return modelMap, nil } -func dataSourceIBMIsBareMetalServerNetworkAttachmentReservedIPReferenceDeletedToMap(model *vpcv1.ReservedIPReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsBareMetalServerNetworkAttachmentReservedIPReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -369,7 +369,7 @@ func dataSourceIBMIsBareMetalServerNetworkAttachmentSubnetReferenceToMap(model * return modelMap, nil } -func dataSourceIBMIsBareMetalServerNetworkAttachmentSubnetReferenceDeletedToMap(model *vpcv1.SubnetReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsBareMetalServerNetworkAttachmentSubnetReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil diff --git a/ibm/service/vpc/data_source_ibm_is_bare_metal_server_network_attachments.go b/ibm/service/vpc/data_source_ibm_is_bare_metal_server_network_attachments.go index 074e7f8af8..ce3a6647a4 100644 --- a/ibm/service/vpc/data_source_ibm_is_bare_metal_server_network_attachments.go +++ b/ibm/service/vpc/data_source_ibm_is_bare_metal_server_network_attachments.go @@ -346,7 +346,7 @@ func dataSourceIBMIsBareMetalServerNetworkAttachmentsReservedIPReferenceToMap(mo return modelMap, nil } -func dataSourceIBMIsBareMetalServerNetworkAttachmentsReservedIPReferenceDeletedToMap(model *vpcv1.ReservedIPReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsBareMetalServerNetworkAttachmentsReservedIPReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -369,7 +369,7 @@ func dataSourceIBMIsBareMetalServerNetworkAttachmentsSubnetReferenceToMap(model return modelMap, nil } -func dataSourceIBMIsBareMetalServerNetworkAttachmentsSubnetReferenceDeletedToMap(model *vpcv1.SubnetReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsBareMetalServerNetworkAttachmentsSubnetReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil diff --git a/ibm/service/vpc/data_source_ibm_is_dedicated_host.go b/ibm/service/vpc/data_source_ibm_is_dedicated_host.go index c224e1ddd3..beb0f4160c 100644 --- a/ibm/service/vpc/data_source_ibm_is_dedicated_host.go +++ b/ibm/service/vpc/data_source_ibm_is_dedicated_host.go @@ -587,7 +587,7 @@ func dataSourceDedicatedHostGroupToMap(groupItem vpcv1.DedicatedHostGroupReferen return groupMap } -func dataSourceDedicatedHostGroupDeletedToMap(deletedItem vpcv1.DedicatedHostGroupReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceDedicatedHostGroupDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -630,7 +630,7 @@ func dataSourceDedicatedHostInstancesToMap(instancesItem vpcv1.InstanceReference return instancesMap } -func dataSourceDedicatedHostInstancesDeletedToMap(deletedItem vpcv1.InstanceReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceDedicatedHostInstancesDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -816,7 +816,7 @@ func dataSourceDedicatedHostDisksInstanceDisksToMap(instanceDisksItem vpcv1.Inst return instanceDisksMap } -func dataSourceDedicatedHostInstanceDisksDeletedToMap(deletedItem vpcv1.InstanceDiskReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceDedicatedHostInstanceDisksDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_dedicated_host_disk.go b/ibm/service/vpc/data_source_ibm_is_dedicated_host_disk.go index def4fdae5d..1607b8c5e6 100644 --- a/ibm/service/vpc/data_source_ibm_is_dedicated_host_disk.go +++ b/ibm/service/vpc/data_source_ibm_is_dedicated_host_disk.go @@ -224,7 +224,7 @@ func dataSourceDedicatedHostDiskInstanceDisksToMap(instanceDisksItem vpcv1.Insta return instanceDisksMap } -func dataSourceDedicatedHostDiskInstanceDisksDeletedToMap(deletedItem vpcv1.InstanceDiskReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceDedicatedHostDiskInstanceDisksDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_dedicated_host_disks.go b/ibm/service/vpc/data_source_ibm_is_dedicated_host_disks.go index 756279b3eb..b740557a16 100644 --- a/ibm/service/vpc/data_source_ibm_is_dedicated_host_disks.go +++ b/ibm/service/vpc/data_source_ibm_is_dedicated_host_disks.go @@ -253,7 +253,7 @@ func dataSourceDedicatedHostDiskCollectionDisksInstanceDisksToMap(instanceDisksI return instanceDisksMap } -func dataSourceDedicatedHostDiskCollectionInstanceDisksDeletedToMap(deletedItem vpcv1.InstanceDiskReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceDedicatedHostDiskCollectionInstanceDisksDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_dedicated_host_group.go b/ibm/service/vpc/data_source_ibm_is_dedicated_host_group.go index d0ee6a88d8..1fd670bb0e 100644 --- a/ibm/service/vpc/data_source_ibm_is_dedicated_host_group.go +++ b/ibm/service/vpc/data_source_ibm_is_dedicated_host_group.go @@ -247,7 +247,7 @@ func dataSourceDedicatedHostGroupDedicatedHostsToMap(dedicatedHostsItem vpcv1.De return dedicatedHostsMap } -func dataSourceDedicatedHostGroupDedicatedHostsDeletedToMap(deletedItem vpcv1.DedicatedHostReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceDedicatedHostGroupDedicatedHostsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_dedicated_host_groups.go b/ibm/service/vpc/data_source_ibm_is_dedicated_host_groups.go index 59475a34da..3d91ec5abf 100644 --- a/ibm/service/vpc/data_source_ibm_is_dedicated_host_groups.go +++ b/ibm/service/vpc/data_source_ibm_is_dedicated_host_groups.go @@ -300,7 +300,7 @@ func dataSourceDedicatedHostGroupCollectionGroupsToMap(groupsItem vpcv1.Dedicate return groupsMap } -func dataSourceDedicatedHostGroupCollectionDedicatedHostsDeletedToMap(deletedItem vpcv1.DedicatedHostReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceDedicatedHostGroupCollectionDedicatedHostsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_dedicated_hosts.go b/ibm/service/vpc/data_source_ibm_is_dedicated_hosts.go index bf3d709b20..436ed7abb0 100644 --- a/ibm/service/vpc/data_source_ibm_is_dedicated_hosts.go +++ b/ibm/service/vpc/data_source_ibm_is_dedicated_hosts.go @@ -637,7 +637,7 @@ func dataSourceDedicatedHostCollectionDedicatedHostsGroupToMap(groupItem vpcv1.D return groupMap } -func dataSourceDedicatedHostCollectionGroupDeletedToMap(deletedItem vpcv1.DedicatedHostGroupReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceDedicatedHostCollectionGroupDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -647,7 +647,7 @@ func dataSourceDedicatedHostCollectionGroupDeletedToMap(deletedItem vpcv1.Dedica return deletedMap } -func dataSourceDedicatedHostCollectionInstancesDeletedToMap(deletedItem vpcv1.InstanceReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceDedicatedHostCollectionInstancesDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_floating_ip.go b/ibm/service/vpc/data_source_ibm_is_floating_ip.go index c682691637..7608641db8 100644 --- a/ibm/service/vpc/data_source_ibm_is_floating_ip.go +++ b/ibm/service/vpc/data_source_ibm_is_floating_ip.go @@ -379,7 +379,7 @@ func dataSourceFloatingIPCollectionFloatingIpTargetToMap(targetItemIntf vpcv1.Fl return targetId, targetMap } -func dataSourceFloatingIPTargetNicDeletedToMap(deletedItem vpcv1.NetworkInterfaceReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceFloatingIPTargetNicDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -388,7 +388,7 @@ func dataSourceFloatingIPTargetNicDeletedToMap(deletedItem vpcv1.NetworkInterfac return deletedMap } -func dataSourceFloatingIPTargetPgDeletedToMap(deletedItem vpcv1.PublicGatewayReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceFloatingIPTargetPgDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_floating_ips.go b/ibm/service/vpc/data_source_ibm_is_floating_ips.go index b37d86d3cd..f62b12ad16 100644 --- a/ibm/service/vpc/data_source_ibm_is_floating_ips.go +++ b/ibm/service/vpc/data_source_ibm_is_floating_ips.go @@ -502,7 +502,7 @@ func dataSourceFloatingIPCollectionFloatingIpsTargetToMap(targetItemIntf vpcv1.F return targetMap } -func dataSourceFloatingIPCollectionTargetNicDeletedToMap(deletedItem vpcv1.NetworkInterfaceReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceFloatingIPCollectionTargetNicDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -511,7 +511,7 @@ func dataSourceFloatingIPCollectionTargetNicDeletedToMap(deletedItem vpcv1.Netwo return deletedMap } -func dataSourceFloatingIPCollectionTargetPgDeletedToMap(deletedItem vpcv1.PublicGatewayReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceFloatingIPCollectionTargetPgDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_flow_log.go b/ibm/service/vpc/data_source_ibm_is_flow_log.go index a4e54e313d..5f469286c7 100644 --- a/ibm/service/vpc/data_source_ibm_is_flow_log.go +++ b/ibm/service/vpc/data_source_ibm_is_flow_log.go @@ -392,7 +392,7 @@ func dataSourceFlowLogCollectorTargetToMap(targetItem vpcv1.FlowLogCollectorTarg return targetMap } -func dataSourceFlowLogCollectorTargetDeletedToMap(deletedItem vpcv1.NetworkInterfaceReferenceTargetContextDeleted) (deletedMap map[string]interface{}) { +func dataSourceFlowLogCollectorTargetDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -435,7 +435,7 @@ func dataSourceFlowLogCollectorVPCToMap(vpcItem vpcv1.VPCReference) (vpcMap map[ return vpcMap } -func dataSourceFlowLogCollectorVPCDeletedToMap(deletedItem vpcv1.VPCReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceFlowLogCollectorVPCDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_ike_policies.go b/ibm/service/vpc/data_source_ibm_is_ike_policies.go index e14ff6c8e2..b2a351e03a 100644 --- a/ibm/service/vpc/data_source_ibm_is_ike_policies.go +++ b/ibm/service/vpc/data_source_ibm_is_ike_policies.go @@ -283,7 +283,7 @@ func dataSourceIkePolicyCollectionIkePoliciesConnectionsToMap(connectionsItem vp return connectionsMap } -func dataSourceIkePolicyCollectionConnectionsDeletedToMap(deletedItem vpcv1.VPNGatewayConnectionReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceIkePolicyCollectionConnectionsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_ike_policy.go b/ibm/service/vpc/data_source_ibm_is_ike_policy.go index 16580ea781..37ce857b16 100644 --- a/ibm/service/vpc/data_source_ibm_is_ike_policy.go +++ b/ibm/service/vpc/data_source_ibm_is_ike_policy.go @@ -284,7 +284,7 @@ func dataSourceIkePolicyConnectionsToMap(connectionsItem vpcv1.VPNGatewayConnect return connectionsMap } -func dataSourceIkePolicyConnectionsDeletedToMap(deletedItem vpcv1.VPNGatewayConnectionReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceIkePolicyConnectionsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_instance.go b/ibm/service/vpc/data_source_ibm_is_instance.go index d2148851a6..0e1aed9a50 100644 --- a/ibm/service/vpc/data_source_ibm_is_instance.go +++ b/ibm/service/vpc/data_source_ibm_is_instance.go @@ -1193,7 +1193,7 @@ func DataSourceIBMISInstance() *schema.Resource { } } -func resourceIbmIsInstanceCatalogOfferingVersionPlanReferenceDeletedToMap(catalogOfferingVersionPlanReferenceDeleted vpcv1.CatalogOfferingVersionPlanReferenceDeleted) map[string]interface{} { +func resourceIbmIsInstanceCatalogOfferingVersionPlanReferenceDeletedToMap(catalogOfferingVersionPlanReferenceDeleted vpcv1.Deleted) map[string]interface{} { catalogOfferingVersionPlanReferenceDeletedMap := map[string]interface{}{} catalogOfferingVersionPlanReferenceDeletedMap["more_info"] = catalogOfferingVersionPlanReferenceDeleted.MoreInfo @@ -1701,7 +1701,7 @@ func instanceGetByName(d *schema.ResourceData, meta interface{}, name string) er } -func dataSourceInstanceReservationDeletedToMap(deletedItem vpcv1.ReservationReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceInstanceReservationDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -1832,7 +1832,7 @@ func dataSourceIBMIsInstanceVirtualNetworkInterfaceReferenceAttachmentContextToM modelMap["resource_type"] = model.ResourceType return modelMap, nil } -func dataSourceIBMIsInstanceInstanceNetworkAttachmentReferenceDeletedToMap(model *vpcv1.InstanceNetworkAttachmentReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsInstanceInstanceNetworkAttachmentReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -1869,13 +1869,13 @@ func dataSourceIBMIsInstanceSubnetReferenceToMap(model *vpcv1.SubnetReference) ( modelMap["resource_type"] = model.ResourceType return modelMap, nil } -func dataSourceIBMIsInstanceSubnetReferenceDeletedToMap(model *vpcv1.SubnetReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsInstanceSubnetReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil } -func dataSourceIBMIsInstanceReservedIPReferenceDeletedToMap(model *vpcv1.ReservedIPReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsInstanceReservedIPReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil diff --git a/ibm/service/vpc/data_source_ibm_is_instance_groups.go b/ibm/service/vpc/data_source_ibm_is_instance_groups.go index 14c00d3d32..aa5c7106fd 100644 --- a/ibm/service/vpc/data_source_ibm_is_instance_groups.go +++ b/ibm/service/vpc/data_source_ibm_is_instance_groups.go @@ -496,7 +496,7 @@ func DataSourceIBMIsInstanceGroupsInstanceTemplateReferenceToMap(model *vpcv1.In return modelMap, nil } -func DataSourceIBMIsInstanceGroupsInstanceTemplateReferenceDeletedToMap(model *vpcv1.InstanceTemplateReferenceDeleted) (map[string]interface{}, error) { +func DataSourceIBMIsInstanceGroupsInstanceTemplateReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) if model.MoreInfo != nil { modelMap["more_info"] = *model.MoreInfo @@ -525,7 +525,7 @@ func DataSourceIBMIsInstanceGroupsLoadBalancerPoolReferenceToMap(model *vpcv1.Lo return modelMap, nil } -func DataSourceIBMIsInstanceGroupsLoadBalancerPoolReferenceDeletedToMap(model *vpcv1.LoadBalancerPoolReferenceDeleted) (map[string]interface{}, error) { +func DataSourceIBMIsInstanceGroupsLoadBalancerPoolReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) if model.MoreInfo != nil { modelMap["more_info"] = *model.MoreInfo @@ -554,7 +554,7 @@ func DataSourceIBMIsInstanceGroupsInstanceGroupManagerReferenceToMap(model *vpcv return modelMap, nil } -func DataSourceIBMIsInstanceGroupsInstanceGroupManagerReferenceDeletedToMap(model *vpcv1.InstanceGroupManagerReferenceDeleted) (map[string]interface{}, error) { +func DataSourceIBMIsInstanceGroupsInstanceGroupManagerReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) if model.MoreInfo != nil { modelMap["more_info"] = *model.MoreInfo @@ -603,7 +603,7 @@ func DataSourceIBMIsInstanceGroupsSubnetReferenceToMap(model *vpcv1.SubnetRefere return modelMap, nil } -func DataSourceIBMIsInstanceGroupsSubnetReferenceDeletedToMap(model *vpcv1.SubnetReferenceDeleted) (map[string]interface{}, error) { +func DataSourceIBMIsInstanceGroupsSubnetReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) if model.MoreInfo != nil { modelMap["more_info"] = *model.MoreInfo @@ -638,7 +638,7 @@ func DataSourceIBMIsInstanceGroupsVPCReferenceToMap(model *vpcv1.VPCReference) ( return modelMap, nil } -func DataSourceIBMIsInstanceGroupsVPCReferenceDeletedToMap(model *vpcv1.VPCReferenceDeleted) (map[string]interface{}, error) { +func DataSourceIBMIsInstanceGroupsVPCReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) if model.MoreInfo != nil { modelMap["more_info"] = *model.MoreInfo diff --git a/ibm/service/vpc/data_source_ibm_is_instance_network_attachment.go b/ibm/service/vpc/data_source_ibm_is_instance_network_attachment.go index 3764651581..b63fce5671 100644 --- a/ibm/service/vpc/data_source_ibm_is_instance_network_attachment.go +++ b/ibm/service/vpc/data_source_ibm_is_instance_network_attachment.go @@ -302,7 +302,7 @@ func dataSourceIBMIsInstanceNetworkAttachmentReservedIPReferenceToMap(model *vpc return modelMap, nil } -func dataSourceIBMIsInstanceNetworkAttachmentReservedIPReferenceDeletedToMap(model *vpcv1.ReservedIPReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsInstanceNetworkAttachmentReservedIPReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -325,7 +325,7 @@ func dataSourceIBMIsInstanceNetworkAttachmentSubnetReferenceToMap(model *vpcv1.S return modelMap, nil } -func dataSourceIBMIsInstanceNetworkAttachmentSubnetReferenceDeletedToMap(model *vpcv1.SubnetReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsInstanceNetworkAttachmentSubnetReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil diff --git a/ibm/service/vpc/data_source_ibm_is_instance_network_attachments.go b/ibm/service/vpc/data_source_ibm_is_instance_network_attachments.go index d530da4e44..0b2b66ab98 100644 --- a/ibm/service/vpc/data_source_ibm_is_instance_network_attachments.go +++ b/ibm/service/vpc/data_source_ibm_is_instance_network_attachments.go @@ -294,7 +294,7 @@ func dataSourceIBMIsInstanceNetworkAttachmentsReservedIPReferenceToMap(model *vp return modelMap, nil } -func dataSourceIBMIsInstanceNetworkAttachmentsReservedIPReferenceDeletedToMap(model *vpcv1.ReservedIPReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsInstanceNetworkAttachmentsReservedIPReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -317,7 +317,7 @@ func dataSourceIBMIsInstanceNetworkAttachmentsSubnetReferenceToMap(model *vpcv1. return modelMap, nil } -func dataSourceIBMIsInstanceNetworkAttachmentsSubnetReferenceDeletedToMap(model *vpcv1.SubnetReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsInstanceNetworkAttachmentsSubnetReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil diff --git a/ibm/service/vpc/data_source_ibm_is_instance_network_interface.go b/ibm/service/vpc/data_source_ibm_is_instance_network_interface.go index bba64f8c06..e33f6c812f 100644 --- a/ibm/service/vpc/data_source_ibm_is_instance_network_interface.go +++ b/ibm/service/vpc/data_source_ibm_is_instance_network_interface.go @@ -409,7 +409,7 @@ func dataSourceNetworkInterfaceFloatingIpsToMap(floatingIpsItem vpcv1.FloatingIP return floatingIpsMap } -func dataSourceNetworkInterfaceFloatingIpsDeletedToMap(deletedItem vpcv1.FloatingIPReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceNetworkInterfaceFloatingIpsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -452,7 +452,7 @@ func dataSourceNetworkInterfaceSecurityGroupsToMap(securityGroupsItem vpcv1.Secu return securityGroupsMap } -func dataSourceNetworkInterfaceSecurityGroupsDeletedToMap(deletedItem vpcv1.SecurityGroupReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceNetworkInterfaceSecurityGroupsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -495,7 +495,7 @@ func dataSourceNetworkInterfaceSubnetToMap(subnetItem vpcv1.SubnetReference) (su return subnetMap } -func dataSourceNetworkInterfaceSubnetDeletedToMap(deletedItem vpcv1.SubnetReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceNetworkInterfaceSubnetDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_ipsec_policies.go b/ibm/service/vpc/data_source_ibm_is_ipsec_policies.go index 37fee725c3..72cf4148f4 100644 --- a/ibm/service/vpc/data_source_ibm_is_ipsec_policies.go +++ b/ibm/service/vpc/data_source_ibm_is_ipsec_policies.go @@ -283,7 +283,7 @@ func dataSourceIPsecPolicyCollectionIpsecPoliciesConnectionsToMap(connectionsIte return connectionsMap } -func dataSourceIPsecPolicyCollectionConnectionsDeletedToMap(deletedItem vpcv1.VPNGatewayConnectionReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceIPsecPolicyCollectionConnectionsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_ipsec_policy.go b/ibm/service/vpc/data_source_ibm_is_ipsec_policy.go index b4a7a64bda..ce2c9e04cd 100644 --- a/ibm/service/vpc/data_source_ibm_is_ipsec_policy.go +++ b/ibm/service/vpc/data_source_ibm_is_ipsec_policy.go @@ -286,7 +286,7 @@ func dataSourceIPsecPolicyConnectionsToMap(connectionsItem vpcv1.VPNGatewayConne return connectionsMap } -func dataSourceIPsecPolicyConnectionsDeletedToMap(deletedItem vpcv1.VPNGatewayConnectionReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceIPsecPolicyConnectionsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_lb_listener.go b/ibm/service/vpc/data_source_ibm_is_lb_listener.go index cb8fd43cf1..c516c118d0 100644 --- a/ibm/service/vpc/data_source_ibm_is_lb_listener.go +++ b/ibm/service/vpc/data_source_ibm_is_lb_listener.go @@ -352,7 +352,7 @@ func dataSourceLoadBalancerListenerDefaultPoolToMap(defaultPoolItem vpcv1.LoadBa return defaultPoolMap } -func dataSourceLoadBalancerListenerDefaultPoolDeletedToMap(deletedItem vpcv1.LoadBalancerPoolReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceLoadBalancerListenerDefaultPoolDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -408,7 +408,7 @@ func dataSourceLoadBalancerListenerHTTPSRedirectListenerToMap(listenerItem vpcv1 return listenerMap } -func dataSourceLoadBalancerListenerListenerDeletedToMap(deletedItem vpcv1.LoadBalancerListenerReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceLoadBalancerListenerListenerDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -445,7 +445,7 @@ func dataSourceLoadBalancerListenerPoliciesToMap(policiesItem vpcv1.LoadBalancer return policiesMap } -func dataSourceLoadBalancerListenerPoliciesDeletedToMap(deletedItem vpcv1.LoadBalancerListenerPolicyReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceLoadBalancerListenerPoliciesDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_lb_listener_policies.go b/ibm/service/vpc/data_source_ibm_is_lb_listener_policies.go index 4a3232fce1..363400096b 100644 --- a/ibm/service/vpc/data_source_ibm_is_lb_listener_policies.go +++ b/ibm/service/vpc/data_source_ibm_is_lb_listener_policies.go @@ -299,7 +299,7 @@ func dataSourceLoadBalancerListenerPolicyCollectionPoliciesRulesToMap(rulesItem return rulesMap } -func dataSourceLoadBalancerListenerPolicyCollectionRulesDeletedToMap(deletedItem vpcv1.LoadBalancerListenerPolicyRuleReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceLoadBalancerListenerPolicyCollectionRulesDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -346,7 +346,7 @@ func dataSourceLoadBalancerListenerPolicyCollectionPoliciesTargetToMap(targetIte return targetMap } -func dataSourceLoadBalancerListenerPolicyCollectionTargetDeletedToMap(deletedItem vpcv1.LoadBalancerPoolReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceLoadBalancerListenerPolicyCollectionTargetDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -375,7 +375,7 @@ func dataSourceLoadBalancerListenerPolicyCollectionTargetListenerToMap(listenerI return listenerMap } -func dataSourceLoadBalancerListenerPolicyCollectionListenerDeletedToMap(deletedItem vpcv1.LoadBalancerListenerReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceLoadBalancerListenerPolicyCollectionListenerDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_lb_listener_policy.go b/ibm/service/vpc/data_source_ibm_is_lb_listener_policy.go index 9ebd0df2bb..90ba7066f6 100644 --- a/ibm/service/vpc/data_source_ibm_is_lb_listener_policy.go +++ b/ibm/service/vpc/data_source_ibm_is_lb_listener_policy.go @@ -270,7 +270,7 @@ func dataSourceLoadBalancerListenerPolicyRulesToMap(rulesItem vpcv1.LoadBalancer return rulesMap } -func dataSourceLoadBalancerListenerPolicyRulesDeletedToMap(deletedItem vpcv1.LoadBalancerListenerPolicyRuleReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceLoadBalancerListenerPolicyRulesDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -325,7 +325,7 @@ func dataSourceLoadBalancerListenerPolicyTargetToMap(targetItem vpcv1.LoadBalanc return targetMap } -func dataSourceLoadBalancerListenerPolicyTargetDeletedToMap(deletedItem vpcv1.LoadBalancerPoolReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceLoadBalancerListenerPolicyTargetDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -354,7 +354,7 @@ func dataSourceLoadBalancerListenerPolicyTargetListenerToMap(listenerItem vpcv1. return listenerMap } -func dataSourceLoadBalancerListenerPolicyListenerDeletedToMap(deletedItem vpcv1.LoadBalancerListenerReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceLoadBalancerListenerPolicyListenerDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_lb_listeners.go b/ibm/service/vpc/data_source_ibm_is_lb_listeners.go index 97c569fc36..4bde6f70fa 100644 --- a/ibm/service/vpc/data_source_ibm_is_lb_listeners.go +++ b/ibm/service/vpc/data_source_ibm_is_lb_listeners.go @@ -368,7 +368,7 @@ func dataSourceLoadBalancerListenerCollectionListenersDefaultPoolToMap(defaultPo return defaultPoolMap } -func dataSourceLoadBalancerListenerCollectionDefaultPoolDeletedToMap(deletedItem vpcv1.LoadBalancerPoolReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceLoadBalancerListenerCollectionDefaultPoolDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -416,7 +416,7 @@ func dataSourceLoadBalancerListenerCollectionHTTPSRedirectListenerToMap(listener return listenerMap } -func dataSourceLoadBalancerListenerCollectionListenerDeletedToMap(deletedItem vpcv1.LoadBalancerListenerReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceLoadBalancerListenerCollectionListenerDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -445,7 +445,7 @@ func dataSourceLoadBalancerListenerCollectionListenersPoliciesToMap(policiesItem return policiesMap } -func dataSourceLoadBalancerListenerCollectionPoliciesDeletedToMap(deletedItem vpcv1.LoadBalancerListenerPolicyReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceLoadBalancerListenerCollectionPoliciesDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_lb_pool.go b/ibm/service/vpc/data_source_ibm_is_lb_pool.go index 9e1c8870d2..c875c48d2c 100644 --- a/ibm/service/vpc/data_source_ibm_is_lb_pool.go +++ b/ibm/service/vpc/data_source_ibm_is_lb_pool.go @@ -377,7 +377,7 @@ func dataSourceLoadBalancerPoolInstanceGroupToMap(instanceGroupItem vpcv1.Instan return instanceGroupMap } -func dataSourceLoadBalancerPoolInstanceGroupDeletedToMap(deletedItem vpcv1.InstanceGroupReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceLoadBalancerPoolInstanceGroupDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -414,7 +414,7 @@ func dataSourceLoadBalancerPoolMembersToMap(membersItem vpcv1.LoadBalancerPoolMe return membersMap } -func dataSourceLoadBalancerPoolMembersDeletedToMap(deletedItem vpcv1.LoadBalancerPoolMemberReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceLoadBalancerPoolMembersDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_lb_pool_member.go b/ibm/service/vpc/data_source_ibm_is_lb_pool_member.go index 8ccd2550f2..78619eb6bf 100644 --- a/ibm/service/vpc/data_source_ibm_is_lb_pool_member.go +++ b/ibm/service/vpc/data_source_ibm_is_lb_pool_member.go @@ -202,7 +202,7 @@ func dataSourceLoadBalancerPoolMemberTargetToMap(targetItem vpcv1.LoadBalancerPo return targetMap } -func dataSourceLoadBalancerPoolMemberTargetDeletedToMap(deletedItem vpcv1.InstanceReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceLoadBalancerPoolMemberTargetDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_lb_pool_members.go b/ibm/service/vpc/data_source_ibm_is_lb_pool_members.go index 8d07993be8..ee158afe1e 100644 --- a/ibm/service/vpc/data_source_ibm_is_lb_pool_members.go +++ b/ibm/service/vpc/data_source_ibm_is_lb_pool_members.go @@ -231,7 +231,7 @@ func dataSourceLoadBalancerPoolMemberCollectionMembersTargetToMap(targetItem vpc return targetMap } -func dataSourceLoadBalancerPoolMemberCollectionTargetDeletedToMap(deletedItem vpcv1.InstanceReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceLoadBalancerPoolMemberCollectionTargetDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_lb_pools.go b/ibm/service/vpc/data_source_ibm_is_lb_pools.go index 7726246568..1a2595e169 100644 --- a/ibm/service/vpc/data_source_ibm_is_lb_pools.go +++ b/ibm/service/vpc/data_source_ibm_is_lb_pools.go @@ -362,7 +362,7 @@ func dataSourceLoadBalancerPoolCollectionPoolsInstanceGroupToMap(instanceGroupIt return instanceGroupMap } -func dataSourceLoadBalancerPoolCollectionInstanceGroupDeletedToMap(deletedItem vpcv1.InstanceGroupReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceLoadBalancerPoolCollectionInstanceGroupDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -391,7 +391,7 @@ func dataSourceLoadBalancerPoolCollectionPoolsMembersToMap(membersItem vpcv1.Loa return membersMap } -func dataSourceLoadBalancerPoolCollectionMembersDeletedToMap(deletedItem vpcv1.LoadBalancerPoolMemberReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceLoadBalancerPoolCollectionMembersDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_network_acl.go b/ibm/service/vpc/data_source_ibm_is_network_acl.go index 36a52369b3..bfe70ea60f 100644 --- a/ibm/service/vpc/data_source_ibm_is_network_acl.go +++ b/ibm/service/vpc/data_source_ibm_is_network_acl.go @@ -623,7 +623,7 @@ func dataSourceNetworkACLRulesBeforeToMap(beforeItem vpcv1.NetworkACLRuleReferen return beforeMap } -func dataSourceNetworkACLBeforeDeletedToMap(deletedItem vpcv1.NetworkACLRuleReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceNetworkACLBeforeDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -666,7 +666,7 @@ func dataSourceNetworkACLSubnetsToMap(subnetsItem vpcv1.SubnetReference) (subnet return subnetsMap } -func dataSourceNetworkACLSubnetsDeletedToMap(deletedItem vpcv1.SubnetReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceNetworkACLSubnetsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -709,7 +709,7 @@ func dataSourceNetworkACLVPCToMap(vpcItem vpcv1.VPCReference) (vpcMap map[string return vpcMap } -func dataSourceNetworkACLVPCDeletedToMap(deletedItem vpcv1.VPCReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceNetworkACLVPCDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_network_acls.go b/ibm/service/vpc/data_source_ibm_is_network_acls.go index 5aa14ba041..7d89bcf894 100644 --- a/ibm/service/vpc/data_source_ibm_is_network_acls.go +++ b/ibm/service/vpc/data_source_ibm_is_network_acls.go @@ -502,7 +502,7 @@ func dataSourceNetworkACLCollectionRulesBeforeToMap(beforeItem vpcv1.NetworkACLR return beforeMap } -func dataSourceNetworkACLCollectionBeforeDeletedToMap(deletedItem vpcv1.NetworkACLRuleReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceNetworkACLCollectionBeforeDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -537,7 +537,7 @@ func dataSourceNetworkACLCollectionNetworkAclsSubnetsToMap(subnetsItem vpcv1.Sub return subnetsMap } -func dataSourceNetworkACLCollectionSubnetsDeletedToMap(deletedItem vpcv1.SubnetReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceNetworkACLCollectionSubnetsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -572,7 +572,7 @@ func dataSourceNetworkACLCollectionNetworkAclsVPCToMap(vpcItem vpcv1.VPCReferenc return vpcMap } -func dataSourceNetworkACLCollectionVPCDeletedToMap(deletedItem vpcv1.VPCReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceNetworkACLCollectionVPCDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_security_group_rule.go b/ibm/service/vpc/data_source_ibm_is_security_group_rule.go index 4226aec4ea..57c30352fc 100644 --- a/ibm/service/vpc/data_source_ibm_is_security_group_rule.go +++ b/ibm/service/vpc/data_source_ibm_is_security_group_rule.go @@ -356,7 +356,7 @@ func dataSourceSecurityGroupRuleLocalToMap(localItem *vpcv1.SecurityGroupRuleLoc return localMap } -func dataSourceSecurityGroupRuleRemoteDeletedToMap(deletedItem *vpcv1.SecurityGroupReferenceDeleted) (resultMap map[string]interface{}) { +func dataSourceSecurityGroupRuleRemoteDeletedToMap(deletedItem *vpcv1.Deleted) (resultMap map[string]interface{}) { resultMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_security_group_rules.go b/ibm/service/vpc/data_source_ibm_is_security_group_rules.go index 0917fd97e5..f99edd4f19 100644 --- a/ibm/service/vpc/data_source_ibm_is_security_group_rules.go +++ b/ibm/service/vpc/data_source_ibm_is_security_group_rules.go @@ -263,7 +263,7 @@ func dataSourceIBMIsSecurityGroupRulesID(d *schema.ResourceData) string { return time.Now().UTC().String() } -func dataSourceSecurityGroupRuleCollectionRemoteDeletedToMap(deletedItem *vpcv1.SecurityGroupReferenceDeleted) (resultMap map[string]interface{}) { +func dataSourceSecurityGroupRuleCollectionRemoteDeletedToMap(deletedItem *vpcv1.Deleted) (resultMap map[string]interface{}) { resultMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_security_groups.go b/ibm/service/vpc/data_source_ibm_is_security_groups.go index a24137927c..791c7fc43f 100644 --- a/ibm/service/vpc/data_source_ibm_is_security_groups.go +++ b/ibm/service/vpc/data_source_ibm_is_security_groups.go @@ -589,7 +589,7 @@ func dataSourceSecurityGroupCollectionSecurityGroupsRulesToMap(rulesItem vpcv1.S return resultMap } -func dataSourceSecurityGroupCollectionRemoteDeletedToMap(deletedItem *vpcv1.SecurityGroupReferenceDeleted) (resultMap map[string]interface{}) { +func dataSourceSecurityGroupCollectionRemoteDeletedToMap(deletedItem *vpcv1.Deleted) (resultMap map[string]interface{}) { resultMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -654,7 +654,7 @@ func dataSourceSecurityGroupCollectionSecurityGroupsTargetsToMap(targetsItem vpc return resultMap } -func dataSourceSecurityGroupCollectionTargetsDeletedToMap(deletedItem *vpcv1.NetworkInterfaceReferenceTargetContextDeleted) (resultMap map[string]interface{}) { +func dataSourceSecurityGroupCollectionTargetsDeletedToMap(deletedItem *vpcv1.Deleted) (resultMap map[string]interface{}) { resultMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -664,7 +664,7 @@ func dataSourceSecurityGroupCollectionTargetsDeletedToMap(deletedItem *vpcv1.Net return resultMap } -func dataSourceSecurityGroupCollectionTargetsDeleted2ToMap(deletedItem *vpcv1.LoadBalancerReferenceDeleted) (resultMap map[string]interface{}) { +func dataSourceSecurityGroupCollectionTargetsDeleted2ToMap(deletedItem *vpcv1.Deleted) (resultMap map[string]interface{}) { resultMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -699,7 +699,7 @@ func dataSourceSecurityGroupCollectionSecurityGroupsVPCToMap(vpcItem *vpcv1.VPCR return resultMap } -func dataSourceSecurityGroupCollectionVPCDeletedToMap(deletedItem *vpcv1.VPCReferenceDeleted) (resultMap map[string]interface{}) { +func dataSourceSecurityGroupCollectionVPCDeletedToMap(deletedItem *vpcv1.Deleted) (resultMap map[string]interface{}) { resultMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_share.go b/ibm/service/vpc/data_source_ibm_is_share.go index 48100560e9..6c321acb33 100644 --- a/ibm/service/vpc/data_source_ibm_is_share.go +++ b/ibm/service/vpc/data_source_ibm_is_share.go @@ -778,7 +778,7 @@ func dataSourceShareTargetsToMap(targetsItem vpcv1.ShareMountTargetReference) (t return targetsMap } -func dataSourceShareTargetsDeletedToMap(deletedItem vpcv1.ShareMountTargetReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceShareTargetsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -868,7 +868,7 @@ func dataSourceShareReplicaShareToMap(replicaShareItem vpcv1.ShareReference) (re return replicaShareMap } -func dataSourceShareReplicaShareDeletedToMap(deletedItem vpcv1.ShareReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceShareReplicaShareDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -938,7 +938,7 @@ func dataSourceShareSourceShareToMap(sourceShareItem vpcv1.ShareReference) (sour return sourceShareMap } -func dataSourceShareSourceShareDeletedToMap(deletedItem vpcv1.ShareReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceShareSourceShareDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_share_accessor_binding.go b/ibm/service/vpc/data_source_ibm_is_share_accessor_binding.go index 16432fa551..c4030f99c2 100644 --- a/ibm/service/vpc/data_source_ibm_is_share_accessor_binding.go +++ b/ibm/service/vpc/data_source_ibm_is_share_accessor_binding.go @@ -251,7 +251,7 @@ func DataSourceIBMIsShareAccessorBindingShareAccessorBindingAccessorToMap(model } } -func DataSourceIBMIsShareAccessorBindingShareReferenceDeletedToMap(model *vpcv1.ShareReferenceDeleted) (map[string]interface{}, error) { +func DataSourceIBMIsShareAccessorBindingShareReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = *model.MoreInfo return modelMap, nil diff --git a/ibm/service/vpc/data_source_ibm_is_share_accessor_binding_test.go b/ibm/service/vpc/data_source_ibm_is_share_accessor_binding_test.go index ffbadde4a5..70ffb32cbf 100644 --- a/ibm/service/vpc/data_source_ibm_is_share_accessor_binding_test.go +++ b/ibm/service/vpc/data_source_ibm_is_share_accessor_binding_test.go @@ -89,7 +89,7 @@ func TestDataSourceIBMIsShareAccessorBindingShareAccessorBindingAccessorToMap(t assert.Equal(t, result, model) } - shareReferenceDeletedModel := new(vpcv1.ShareReferenceDeleted) + shareReferenceDeletedModel := new(vpcv1.Deleted) shareReferenceDeletedModel.MoreInfo = core.StringPtr("https://cloud.ibm.com/apidocs/vpc#deleted-resources") accountReferenceModel := new(vpcv1.AccountReference) @@ -126,7 +126,7 @@ func TestDataSourceIBMIsShareAccessorBindingShareReferenceDeletedToMap(t *testin assert.Equal(t, result, model) } - model := new(vpcv1.ShareReferenceDeleted) + model := new(vpcv1.Deleted) model.MoreInfo = core.StringPtr("https://cloud.ibm.com/apidocs/vpc#deleted-resources") result, err := vpc.DataSourceIBMIsShareAccessorBindingShareReferenceDeletedToMap(model) @@ -233,7 +233,7 @@ func TestDataSourceIBMIsShareAccessorBindingShareAccessorBindingAccessorShareRef assert.Equal(t, result, model) } - shareReferenceDeletedModel := new(vpcv1.ShareReferenceDeleted) + shareReferenceDeletedModel := new(vpcv1.Deleted) shareReferenceDeletedModel.MoreInfo = core.StringPtr("https://cloud.ibm.com/apidocs/vpc#deleted-resources") accountReferenceModel := new(vpcv1.AccountReference) diff --git a/ibm/service/vpc/data_source_ibm_is_share_accessor_bindings.go b/ibm/service/vpc/data_source_ibm_is_share_accessor_bindings.go index 8649fa6a09..4fefad2bd3 100644 --- a/ibm/service/vpc/data_source_ibm_is_share_accessor_bindings.go +++ b/ibm/service/vpc/data_source_ibm_is_share_accessor_bindings.go @@ -274,7 +274,7 @@ func DataSourceIBMIsShareAccessorBindingsShareAccessorBindingAccessorToMap(model } } -func DataSourceIBMIsShareAccessorBindingsShareReferenceDeletedToMap(model *vpcv1.ShareReferenceDeleted) (map[string]interface{}, error) { +func DataSourceIBMIsShareAccessorBindingsShareReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = *model.MoreInfo return modelMap, nil diff --git a/ibm/service/vpc/data_source_ibm_is_share_accessor_bindings_test.go b/ibm/service/vpc/data_source_ibm_is_share_accessor_bindings_test.go index f717e6b047..6af1a6f07d 100644 --- a/ibm/service/vpc/data_source_ibm_is_share_accessor_bindings_test.go +++ b/ibm/service/vpc/data_source_ibm_is_share_accessor_bindings_test.go @@ -91,7 +91,7 @@ func TestDataSourceIBMIsShareAccessorBindingsShareAccessorBindingToMap(t *testin assert.Equal(t, result, model) } - shareReferenceDeletedModel := new(vpcv1.ShareReferenceDeleted) + shareReferenceDeletedModel := new(vpcv1.Deleted) shareReferenceDeletedModel.MoreInfo = core.StringPtr("https://cloud.ibm.com/apidocs/vpc#deleted-resources") accountReferenceModel := new(vpcv1.AccountReference) @@ -157,7 +157,7 @@ func TestDataSourceIBMIsShareAccessorBindingsShareAccessorBindingAccessorToMap(t assert.Equal(t, result, model) } - shareReferenceDeletedModel := new(vpcv1.ShareReferenceDeleted) + shareReferenceDeletedModel := new(vpcv1.Deleted) shareReferenceDeletedModel.MoreInfo = core.StringPtr("https://cloud.ibm.com/apidocs/vpc#deleted-resources") accountReferenceModel := new(vpcv1.AccountReference) @@ -194,7 +194,7 @@ func TestDataSourceIBMIsShareAccessorBindingsShareReferenceDeletedToMap(t *testi assert.Equal(t, result, model) } - model := new(vpcv1.ShareReferenceDeleted) + model := new(vpcv1.Deleted) model.MoreInfo = core.StringPtr("https://cloud.ibm.com/apidocs/vpc#deleted-resources") result, err := vpc.DataSourceIBMIsShareAccessorBindingsShareReferenceDeletedToMap(model) @@ -301,7 +301,7 @@ func TestDataSourceIBMIsShareAccessorBindingsShareAccessorBindingAccessorShareRe assert.Equal(t, result, model) } - shareReferenceDeletedModel := new(vpcv1.ShareReferenceDeleted) + shareReferenceDeletedModel := new(vpcv1.Deleted) shareReferenceDeletedModel.MoreInfo = core.StringPtr("https://cloud.ibm.com/apidocs/vpc#deleted-resources") accountReferenceModel := new(vpcv1.AccountReference) diff --git a/ibm/service/vpc/data_source_ibm_is_share_mount_target.go b/ibm/service/vpc/data_source_ibm_is_share_mount_target.go index 577f223188..8b2ec5dea9 100644 --- a/ibm/service/vpc/data_source_ibm_is_share_mount_target.go +++ b/ibm/service/vpc/data_source_ibm_is_share_mount_target.go @@ -427,7 +427,7 @@ func dataSourceShareMountTargetVpcToMap(vpcItem vpcv1.VPCReference) (vpcMap map[ return vpcMap } -func dataSourceShareMountTargetVpcDeletedToMap(deletedItem vpcv1.VPCReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceShareMountTargetVpcDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -474,7 +474,7 @@ func dataSourceShareTargetPrimaryIPToMap(primaryIPItem vpcv1.ReservedIPReference return primaryIPMap } -func dataSourceShareTargetPrimaryIPDeletedToMap(deletedItem vpcv1.ReservedIPReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceShareTargetPrimaryIPDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -521,7 +521,7 @@ func dataSourceShareTargetSubnetToMap(subnetItem vpcv1.SubnetReference) (subnetM return subnetMap } -func dataSourceShareTargetSubnetDeletedToMap(deletedItem vpcv1.SubnetReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceShareTargetSubnetDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_snapshot.go b/ibm/service/vpc/data_source_ibm_is_snapshot.go index 3e82882fde..75a3ca6cdc 100644 --- a/ibm/service/vpc/data_source_ibm_is_snapshot.go +++ b/ibm/service/vpc/data_source_ibm_is_snapshot.go @@ -748,7 +748,7 @@ func snapshotGetByNameOrID(d *schema.ResourceData, meta interface{}, name, id st } } -func resourceIbmIsSnapshotCatalogOfferingVersionPlanReferenceDeletedToMap(catalogOfferingVersionPlanReferenceDeleted vpcv1.CatalogOfferingVersionPlanReferenceDeleted) map[string]interface{} { +func resourceIbmIsSnapshotCatalogOfferingVersionPlanReferenceDeletedToMap(catalogOfferingVersionPlanReferenceDeleted vpcv1.Deleted) map[string]interface{} { catalogOfferingVersionPlanReferenceDeletedMap := map[string]interface{}{} catalogOfferingVersionPlanReferenceDeletedMap["more_info"] = catalogOfferingVersionPlanReferenceDeleted.MoreInfo diff --git a/ibm/service/vpc/data_source_ibm_is_snapshot_consistency_group.go b/ibm/service/vpc/data_source_ibm_is_snapshot_consistency_group.go index 6dc6c45c17..9b193fb4b4 100644 --- a/ibm/service/vpc/data_source_ibm_is_snapshot_consistency_group.go +++ b/ibm/service/vpc/data_source_ibm_is_snapshot_consistency_group.go @@ -510,7 +510,7 @@ func dataSourceIBMIsSnapshotConsistencyGroupBackupPolicyPlanReferenceToMap(model return modelMap, nil } -func dataSourceIBMIsSnapshotConsistencyGroupBackupPolicyPlanReferenceDeletedToMap(model *vpcv1.BackupPolicyPlanReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsSnapshotConsistencyGroupBackupPolicyPlanReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -567,7 +567,7 @@ func dataSourceIBMIsSnapshotConsistencyGroupSnapshotConsistencyGroupSnapshotsIte return modelMap, nil } -func dataSourceIBMIsSnapshotConsistencyGroupSnapshotReferenceDeletedToMap(model *vpcv1.SnapshotReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsSnapshotConsistencyGroupSnapshotReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil diff --git a/ibm/service/vpc/data_source_ibm_is_snapshots.go b/ibm/service/vpc/data_source_ibm_is_snapshots.go index ef227c9250..4689bc75e1 100644 --- a/ibm/service/vpc/data_source_ibm_is_snapshots.go +++ b/ibm/service/vpc/data_source_ibm_is_snapshots.go @@ -802,7 +802,7 @@ func dataSourceIBMIsSnapshotsSnapshotCopiesItemToMap(model *vpcv1.SnapshotCopies return modelMap, nil } -func dataSourceIBMIsSnapshotsSnapshotRemoteReferenceDeletedToMap(model *vpcv1.SnapshotReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsSnapshotsSnapshotRemoteReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) if model.MoreInfo != nil { modelMap["more_info"] = *model.MoreInfo diff --git a/ibm/service/vpc/data_source_ibm_is_subnet.go b/ibm/service/vpc/data_source_ibm_is_subnet.go index 92154b1759..57885ea49c 100644 --- a/ibm/service/vpc/data_source_ibm_is_subnet.go +++ b/ibm/service/vpc/data_source_ibm_is_subnet.go @@ -318,7 +318,7 @@ func subnetGetByNameOrID(d *schema.ResourceData, meta interface{}) error { return nil } -func dataSourcesubnetRoutingTableDeletedToMap(deletedItem vpcv1.RoutingTableReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourcesubnetRoutingTableDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_subnet_reserved_ips.go b/ibm/service/vpc/data_source_ibm_is_subnet_reserved_ips.go index 7777bb175d..6f85003c3e 100644 --- a/ibm/service/vpc/data_source_ibm_is_subnet_reserved_ips.go +++ b/ibm/service/vpc/data_source_ibm_is_subnet_reserved_ips.go @@ -277,7 +277,7 @@ func dataSourceIBMIsReservedIPReservedIPTargetToMap(model vpcv1.ReservedIPTarget } } -func dataSourceIBMIsReservedIPEndpointGatewayReferenceDeletedToMap(model *vpcv1.EndpointGatewayReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsReservedIPEndpointGatewayReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -326,7 +326,7 @@ func dataSourceIBMIsReservedIPReservedIPTargetNetworkInterfaceReferenceTargetCon return modelMap, nil } -func dataSourceIBMIsReservedIPNetworkInterfaceReferenceTargetContextDeletedToMap(model *vpcv1.NetworkInterfaceReferenceTargetContextDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsReservedIPNetworkInterfaceReferenceTargetContextDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -348,7 +348,7 @@ func dataSourceIBMIsReservedIPReservedIPTargetBareMetalServerNetworkInterfaceRef return modelMap, nil } -func dataSourceIBMIsReservedIPBareMetalServerNetworkInterfaceReferenceTargetContextDeletedToMap(model *vpcv1.BareMetalServerNetworkInterfaceReferenceTargetContextDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsReservedIPBareMetalServerNetworkInterfaceReferenceTargetContextDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -371,7 +371,7 @@ func dataSourceIBMIsReservedIPReservedIPTargetLoadBalancerReferenceToMap(model * return modelMap, nil } -func dataSourceIBMIsReservedIPLoadBalancerReferenceDeletedToMap(model *vpcv1.LoadBalancerReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsReservedIPLoadBalancerReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -394,7 +394,7 @@ func dataSourceIBMIsReservedIPReservedIPTargetVPNGatewayReferenceToMap(model *vp return modelMap, nil } -func dataSourceIBMIsReservedIPVPNGatewayReferenceDeletedToMap(model *vpcv1.VPNGatewayReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsReservedIPVPNGatewayReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -417,7 +417,7 @@ func dataSourceIBMIsReservedIPReservedIPTargetVPNServerReferenceToMap(model *vpc return modelMap, nil } -func dataSourceIBMIsReservedIPVPNServerReferenceDeletedToMap(model *vpcv1.VPNServerReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsReservedIPVPNServerReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -437,7 +437,7 @@ func dataSourceIBMIsReservedIPReservedIPTargetGenericResourceReferenceToMap(mode return modelMap, nil } -func dataSourceIBMIsReservedIPGenericResourceReferenceDeletedToMap(model *vpcv1.GenericResourceReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsReservedIPGenericResourceReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil diff --git a/ibm/service/vpc/data_source_ibm_is_virtual_network_interface.go b/ibm/service/vpc/data_source_ibm_is_virtual_network_interface.go index ed62a65983..461876a103 100644 --- a/ibm/service/vpc/data_source_ibm_is_virtual_network_interface.go +++ b/ibm/service/vpc/data_source_ibm_is_virtual_network_interface.go @@ -630,7 +630,7 @@ func dataSourceIBMIsVirtualNetworkInterfaceReservedIPReferenceToMap(model *vpcv1 return modelMap, nil } -func dataSourceIBMIsVirtualNetworkInterfaceReservedIPReferenceDeletedToMap(model *vpcv1.ReservedIPReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsVirtualNetworkInterfaceReservedIPReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) if model.MoreInfo != nil { modelMap["more_info"] = *model.MoreInfo @@ -676,7 +676,7 @@ func dataSourceIBMIsVirtualNetworkInterfaceSecurityGroupReferenceToMap(model *vp return modelMap, nil } -func dataSourceIBMIsVirtualNetworkInterfaceSecurityGroupReferenceDeletedToMap(model *vpcv1.SecurityGroupReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsVirtualNetworkInterfaceSecurityGroupReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) if model.MoreInfo != nil { modelMap["more_info"] = *model.MoreInfo @@ -711,7 +711,7 @@ func dataSourceIBMIsVirtualNetworkInterfaceSubnetReferenceToMap(model *vpcv1.Sub return modelMap, nil } -func dataSourceIBMIsVirtualNetworkInterfaceSubnetReferenceDeletedToMap(model *vpcv1.SubnetReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsVirtualNetworkInterfaceSubnetReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) if model.MoreInfo != nil { modelMap["more_info"] = *model.MoreInfo @@ -750,7 +750,7 @@ func dataSourceIBMIsVirtualNetworkInterfaceVirtualNetworkInterfaceTargetToMap(mo } } -func dataSourceIBMIsVirtualNetworkInterfaceShareMountTargetReferenceDeletedToMap(model *vpcv1.ShareMountTargetReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsVirtualNetworkInterfaceShareMountTargetReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) if model.MoreInfo != nil { modelMap["more_info"] = *model.MoreInfo @@ -809,7 +809,7 @@ func dataSourceIBMIsVirtualNetworkInterfaceVPCReferenceToMap(model *vpcv1.VPCRef return modelMap, nil } -func dataSourceIBMIsVirtualNetworkInterfaceVPCReferenceDeletedToMap(model *vpcv1.VPCReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsVirtualNetworkInterfaceVPCReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) if model.MoreInfo != nil { modelMap["more_info"] = *model.MoreInfo diff --git a/ibm/service/vpc/data_source_ibm_is_volume.go b/ibm/service/vpc/data_source_ibm_is_volume.go index 9994ed1797..95af9adeab 100644 --- a/ibm/service/vpc/data_source_ibm_is_volume.go +++ b/ibm/service/vpc/data_source_ibm_is_volume.go @@ -470,7 +470,7 @@ func volumeGet(d *schema.ResourceData, meta interface{}, name string) error { return nil } -func resourceIbmIsVolumeCatalogOfferingVersionPlanReferenceDeletedToMap(catalogOfferingVersionPlanReferenceDeleted vpcv1.CatalogOfferingVersionPlanReferenceDeleted) map[string]interface{} { +func resourceIbmIsVolumeCatalogOfferingVersionPlanReferenceDeletedToMap(catalogOfferingVersionPlanReferenceDeleted vpcv1.Deleted) map[string]interface{} { catalogOfferingVersionPlanReferenceDeletedMap := map[string]interface{}{} catalogOfferingVersionPlanReferenceDeletedMap["more_info"] = catalogOfferingVersionPlanReferenceDeleted.MoreInfo diff --git a/ibm/service/vpc/data_source_ibm_is_volumes.go b/ibm/service/vpc/data_source_ibm_is_volumes.go index aec47ddeed..8a8e449da4 100644 --- a/ibm/service/vpc/data_source_ibm_is_volumes.go +++ b/ibm/service/vpc/data_source_ibm_is_volumes.go @@ -952,7 +952,7 @@ func dataSourceVolumeCollectionVolumesSourceImageToMap(sourceImageItem vpcv1.Ima return sourceImageMap } -func dataSourceVolumeCollectionSourceImageDeletedToMap(deletedItem vpcv1.ImageReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceVolumeCollectionSourceImageDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -990,7 +990,7 @@ func dataSourceVolumeCollectionVolumesSourceSnapshotToMap(sourceSnapshotItem vpc return sourceSnapshotMap } -func dataSourceVolumeCollectionSourceSnapshotDeletedToMap(deletedItem vpcv1.SnapshotReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceVolumeCollectionSourceSnapshotDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -1072,7 +1072,7 @@ func dataSourceVolumeCollectionVolumesVolumeAttachmentsToMap(volumeAttachmentsIt return volumeAttachmentsMap } -func dataSourceVolumeCollectionVolumeAttachmentsDeletedToMap(deletedItem vpcv1.VolumeAttachmentReferenceVolumeContextDeleted) (deletedMap map[string]interface{}) { +func dataSourceVolumeCollectionVolumeAttachmentsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -1117,7 +1117,7 @@ func dataSourceVolumeCollectionVolumeAttachmentsInstanceToMap(instanceItem vpcv1 return instanceMap } -func dataSourceVolumeCollectionInstanceDeletedToMap(deletedItem vpcv1.InstanceReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceVolumeCollectionInstanceDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_vpc.go b/ibm/service/vpc/data_source_ibm_is_vpc.go index 8122ec6f4a..1c8b8db382 100644 --- a/ibm/service/vpc/data_source_ibm_is_vpc.go +++ b/ibm/service/vpc/data_source_ibm_is_vpc.go @@ -978,7 +978,7 @@ func dataSourceIBMIsVPCVPCReferenceDnsResolverContextToMap(model *vpcv1.VPCRefer return modelMap, nil } -func dataSourceIBMIsVPCVPCReferenceDnsResolverContextDeletedToMap(model *vpcv1.VPCReferenceDnsResolverContextDeleted) (map[string]interface{}, error) { +func dataSourceIBMIsVPCVPCReferenceDnsResolverContextDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil diff --git a/ibm/service/vpc/data_source_ibm_is_vpc_routing_table.go b/ibm/service/vpc/data_source_ibm_is_vpc_routing_table.go index d80be4197a..30bd93f954 100644 --- a/ibm/service/vpc/data_source_ibm_is_vpc_routing_table.go +++ b/ibm/service/vpc/data_source_ibm_is_vpc_routing_table.go @@ -363,7 +363,7 @@ func dataSourceIBMIBMIsVPCRoutingTableRouteReferenceToMap(model *vpcv1.RouteRefe return modelMap, nil } -func dataSourceIBMIBMIsVPCRoutingTableRouteReferenceDeletedToMap(model *vpcv1.RouteReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIBMIsVPCRoutingTableRouteReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := map[string]interface{}{} if model.MoreInfo != nil { modelMap[rMoreInfo] = *model.MoreInfo @@ -395,7 +395,7 @@ func dataSourceIBMIBMIsVPCRoutingTableSubnetReferenceToMap(model *vpcv1.SubnetRe return modelMap, nil } -func dataSourceIBMIBMIsVPCRoutingTableSubnetReferenceDeletedToMap(model *vpcv1.SubnetReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIBMIsVPCRoutingTableSubnetReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := map[string]interface{}{} if model.MoreInfo != nil { modelMap[rMoreInfo] = *model.MoreInfo diff --git a/ibm/service/vpc/data_source_ibm_is_vpc_routing_table_route.go b/ibm/service/vpc/data_source_ibm_is_vpc_routing_table_route.go index da18a18571..0c487e86dd 100644 --- a/ibm/service/vpc/data_source_ibm_is_vpc_routing_table_route.go +++ b/ibm/service/vpc/data_source_ibm_is_vpc_routing_table_route.go @@ -390,7 +390,7 @@ func dataSourceIBMIBMIsVPCRoutingTableRouteRouteNextHopToMap(model vpcv1.RouteNe } } -func dataSourceIBMIBMIsVPCRoutingTableRouteVPNGatewayConnectionReferenceDeletedToMap(model *vpcv1.VPNGatewayConnectionReferenceDeleted) (map[string]interface{}, error) { +func dataSourceIBMIBMIsVPCRoutingTableRouteVPNGatewayConnectionReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := map[string]interface{}{} if model.MoreInfo != nil { modelMap[rMoreInfo] = *model.MoreInfo diff --git a/ibm/service/vpc/data_source_ibm_is_vpc_routing_table_routes.go b/ibm/service/vpc/data_source_ibm_is_vpc_routing_table_routes.go index 6e723e5db6..b54e85b0ed 100644 --- a/ibm/service/vpc/data_source_ibm_is_vpc_routing_table_routes.go +++ b/ibm/service/vpc/data_source_ibm_is_vpc_routing_table_routes.go @@ -354,7 +354,7 @@ func DataSourceIBMIsRouteCreatorVPNServerReferenceToMap(model *vpcv1.RouteCreato return modelMap, nil } -func DataSourceIBMIsRouteVPNGatewayReferenceDeletedToMap(model *vpcv1.VPNGatewayReferenceDeleted) (map[string]interface{}, error) { +func DataSourceIBMIsRouteVPNGatewayReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) if model.MoreInfo != nil { modelMap["more_info"] = *model.MoreInfo @@ -362,7 +362,7 @@ func DataSourceIBMIsRouteVPNGatewayReferenceDeletedToMap(model *vpcv1.VPNGateway return modelMap, nil } -func DataSourceIBMIsRouteVPNServerReferenceDeletedToMap(model *vpcv1.VPNServerReferenceDeleted) (map[string]interface{}, error) { +func DataSourceIBMIsRouteVPNServerReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) if model.MoreInfo != nil { modelMap["more_info"] = *model.MoreInfo diff --git a/ibm/service/vpc/data_source_ibm_is_vpn_gateway.go b/ibm/service/vpc/data_source_ibm_is_vpn_gateway.go index 9fb96fd3c8..be0f4ce1e7 100644 --- a/ibm/service/vpc/data_source_ibm_is_vpn_gateway.go +++ b/ibm/service/vpc/data_source_ibm_is_vpn_gateway.go @@ -493,7 +493,7 @@ func dataSourceVPNGatewayConnectionsToMap(connectionsItem vpcv1.VPNGatewayConnec return connectionsMap } -func dataSourceVPNGatewayConnectionsDeletedToMap(deletedItem vpcv1.VPNGatewayConnectionReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceVPNGatewayConnectionsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -584,7 +584,7 @@ func dataSourceVPNGatewaySubnetToMap(subnetItem vpcv1.SubnetReference) (subnetMa return subnetMap } -func dataSourceVPNGatewaySubnetDeletedToMap(deletedItem vpcv1.SubnetReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceVPNGatewaySubnetDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -625,7 +625,7 @@ func dataSourceVPNGatewayVpcToMap(vpcItem vpcv1.VPCReference) (vpcsMap map[strin } -func dataSourceVPNGatewayVpcDeletedToMap(deletedItem vpcv1.VPCReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceVPNGatewayVpcDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_vpn_gateway_connection.go b/ibm/service/vpc/data_source_ibm_is_vpn_gateway_connection.go index bfdbd90d82..d45844768a 100644 --- a/ibm/service/vpc/data_source_ibm_is_vpn_gateway_connection.go +++ b/ibm/service/vpc/data_source_ibm_is_vpn_gateway_connection.go @@ -962,7 +962,7 @@ func dataSourceVPNGatewayConnectionIkePolicyToMap(ikePolicyItem vpcv1.IkePolicyR return ikePolicyMap } -func dataSourceVPNGatewayConnectionIkePolicyDeletedToMap(deletedItem vpcv1.IkePolicyReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceVPNGatewayConnectionIkePolicyDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -1005,7 +1005,7 @@ func dataSourceVPNGatewayConnectionIpsecPolicyToMap(ipsecPolicyItem vpcv1.IPsecP return ipsecPolicyMap } -func dataSourceVPNGatewayConnectionIpsecPolicyDeletedToMap(deletedItem vpcv1.IPsecPolicyReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceVPNGatewayConnectionIpsecPolicyDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_vpn_gateways.go b/ibm/service/vpc/data_source_ibm_is_vpn_gateways.go index 89c8bdde9f..7f1eea5eb5 100644 --- a/ibm/service/vpc/data_source_ibm_is_vpn_gateways.go +++ b/ibm/service/vpc/data_source_ibm_is_vpn_gateways.go @@ -359,7 +359,7 @@ func dataSourceVPNServerCollectionVPNGatewayVpcReferenceToMap(vpcsItem *vpcv1.VP return vpcsMap } -func dataSourceVPNGatewayCollectionVpcsDeletedToMap(deletedItem vpcv1.VPCReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceVPNGatewayCollectionVpcsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_vpn_server.go b/ibm/service/vpc/data_source_ibm_is_vpn_server.go index 4595cb40ef..cb02d3091a 100644 --- a/ibm/service/vpc/data_source_ibm_is_vpn_server.go +++ b/ibm/service/vpc/data_source_ibm_is_vpn_server.go @@ -707,7 +707,7 @@ func dataSourceVPNServerPrivateIpsToMap(privateIpsItem vpcv1.ReservedIPReference return privateIpsMap } -func dataSourceVPNServerPrivateIpsDeletedToMap(deletedItem vpcv1.ReservedIPReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceVPNServerPrivateIpsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -774,7 +774,7 @@ func dataSourceVPNServerSecurityGroupsToMap(securityGroupsItem vpcv1.SecurityGro return securityGroupsMap } -func dataSourceVPNServerSecurityGroupsDeletedToMap(deletedItem vpcv1.SecurityGroupReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceVPNServerSecurityGroupsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -817,7 +817,7 @@ func dataSourceVPNServerSubnetsToMap(subnetsItem vpcv1.SubnetReference) (subnets return subnetsMap } -func dataSourceVPNServerSubnetsDeletedToMap(deletedItem vpcv1.SubnetReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceVPNServerSubnetsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -857,7 +857,7 @@ func dataSourceVPNServerVpcToMap(vpcItem vpcv1.VPCReference) (vpcsMap map[string return vpcsMap } -func dataSourceVPNServerVpcsDeletedToMap(deletedItem vpcv1.VPCReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceVPNServerVpcsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_vpn_servers.go b/ibm/service/vpc/data_source_ibm_is_vpn_servers.go index 06a4e29d92..0ba98e781f 100644 --- a/ibm/service/vpc/data_source_ibm_is_vpn_servers.go +++ b/ibm/service/vpc/data_source_ibm_is_vpn_servers.go @@ -733,7 +733,7 @@ func dataSourceVPNServerCollectionVPNServersPrivateIpsToMap(privateIpsItem vpcv1 return privateIpsMap } -func dataSourceVPNServerCollectionPrivateIpsDeletedToMap(deletedItem vpcv1.ReservedIPReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceVPNServerCollectionPrivateIpsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -784,7 +784,7 @@ func dataSourceVPNServerCollectionVPNServersSecurityGroupsToMap(securityGroupsIt return securityGroupsMap } -func dataSourceVPNServerCollectionSecurityGroupsDeletedToMap(deletedItem vpcv1.SecurityGroupReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceVPNServerCollectionSecurityGroupsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -822,7 +822,7 @@ func dataSourceVPNServerCollectionVPNServersSubnetsToMap(subnetsItem vpcv1.Subne return subnetsMap } -func dataSourceVPNServerCollectionSubnetsDeletedToMap(deletedItem vpcv1.SubnetReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceVPNServerCollectionSubnetsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -861,7 +861,7 @@ func dataSourceVPNServerCollectionVPNServersVpcReferenceToMap(vpcsItem *vpcv1.VP return vpcsMap } -func dataSourceVPNServerCollectionVpcsDeletedToMap(deletedItem vpcv1.VPCReferenceDeleted) (deletedMap map[string]interface{}) { +func dataSourceVPNServerCollectionVpcsDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/data_source_ibm_is_zone.go b/ibm/service/vpc/data_source_ibm_is_zone.go index fe89424be4..cf72e45143 100644 --- a/ibm/service/vpc/data_source_ibm_is_zone.go +++ b/ibm/service/vpc/data_source_ibm_is_zone.go @@ -14,6 +14,9 @@ const ( isZoneName = "name" isZoneRegion = "region" isZoneStatus = "status" + + isZoneDataCenter = "data_center" + isZoneUniversalName = "universal_name" ) func DataSourceIBMISZone() *schema.Resource { @@ -36,6 +39,14 @@ func DataSourceIBMISZone() *schema.Resource { Type: schema.TypeString, Computed: true, }, + isZoneDataCenter: { + Type: schema.TypeString, + Computed: true, + }, + isZoneUniversalName: { + Type: schema.TypeString, + Computed: true, + }, }, } } @@ -65,5 +76,11 @@ func zoneGet(d *schema.ResourceData, meta interface{}, regionName, zoneName stri d.Set(isZoneName, *zone.Name) d.Set(isZoneRegion, *zone.Region.Name) d.Set(isZoneStatus, *zone.Status) + if zone.DataCenter != nil { + d.Set(isZoneDataCenter, *zone.DataCenter) + } + if zone.UniversalName != nil { + d.Set(isZoneUniversalName, *zone.UniversalName) + } return nil } diff --git a/ibm/service/vpc/data_source_ibm_is_zone_test.go b/ibm/service/vpc/data_source_ibm_is_zone_test.go index cf7823abe7..6c064551fc 100644 --- a/ibm/service/vpc/data_source_ibm_is_zone_test.go +++ b/ibm/service/vpc/data_source_ibm_is_zone_test.go @@ -23,6 +23,8 @@ func TestAccIBMISZoneDataSource_basic(t *testing.T) { Check: resource.ComposeTestCheckFunc( resource.TestCheckResourceAttr("data.ibm_is_zone.testacc_ds_zone", "name", acc.ISZoneName), resource.TestCheckResourceAttr("data.ibm_is_zone.testacc_ds_zone", "region", acc.RegionName), + resource.TestCheckResourceAttr("data.ibm_is_zone.testacc_ds_zone", "data_center", "DAL10"), + resource.TestCheckResourceAttr("data.ibm_is_zone.testacc_ds_zone", "universal_name", "us-south-dal10-a"), ), }, }, diff --git a/ibm/service/vpc/data_source_ibm_is_zones.go b/ibm/service/vpc/data_source_ibm_is_zones.go index 0772cb4108..0ce5d842f5 100644 --- a/ibm/service/vpc/data_source_ibm_is_zones.go +++ b/ibm/service/vpc/data_source_ibm_is_zones.go @@ -12,6 +12,7 @@ import ( const ( isZoneNames = "zones" + isZonesInfo = "zone_info" ) func DataSourceIBMISZones() *schema.Resource { @@ -35,6 +36,31 @@ func DataSourceIBMISZones() *schema.Resource { Computed: true, Elem: &schema.Schema{Type: schema.TypeString}, }, + isZonesInfo: { + Type: schema.TypeList, + Computed: true, + Description: "The zones information in the region", + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + isZoneName: { + Type: schema.TypeString, + Computed: true, + }, + isZoneUniversalName: { + Type: schema.TypeString, + Computed: true, + }, + isZoneDataCenter: { + Type: schema.TypeString, + Computed: true, + }, + isZoneStatus: { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, }, } } @@ -59,13 +85,25 @@ func zonesList(d *schema.ResourceData, meta interface{}, regionName string) erro } names := make([]string, 0) status := d.Get(isZoneStatus).(string) + zonesList := make([]map[string]interface{}, 0) for _, zone := range availableZones.Zones { + zoneInfo := map[string]interface{}{} if status == "" || *zone.Status == status { names = append(names, *zone.Name) + zoneInfo[isZoneName] = *zone.Name + zoneInfo[isZoneStatus] = *zone.Status + if zone.DataCenter != nil { + zoneInfo[isZoneDataCenter] = *zone.DataCenter + } + if zone.UniversalName != nil { + zoneInfo[isZoneUniversalName] = *zone.UniversalName + } } + zonesList = append(zonesList, zoneInfo) } d.SetId(dataSourceIBMISZonesId(d)) d.Set(isZoneNames, names) + d.Set(isZonesInfo, zonesList) return nil } diff --git a/ibm/service/vpc/resource_ibm_is_bare_metal_server.go b/ibm/service/vpc/resource_ibm_is_bare_metal_server.go index f0e3502abd..766496bdf0 100644 --- a/ibm/service/vpc/resource_ibm_is_bare_metal_server.go +++ b/ibm/service/vpc/resource_ibm_is_bare_metal_server.go @@ -4246,7 +4246,7 @@ func resourceIBMIsBareMetalServerBareMetalServerNetworkAttachmentReferenceToMap( return modelMap, nil } -func resourceIBMIsBareMetalServerBareMetalServerNetworkAttachmentReferenceDeletedToMap(model *vpcv1.BareMetalServerNetworkAttachmentReferenceDeleted) (map[string]interface{}, error) { +func resourceIBMIsBareMetalServerBareMetalServerNetworkAttachmentReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -4269,7 +4269,7 @@ func resourceIBMIsBareMetalServerReservedIPReferenceToMap(model *vpcv1.ReservedI return modelMap, nil } -func resourceIBMIsBareMetalServerReservedIPReferenceDeletedToMap(model *vpcv1.ReservedIPReferenceDeleted) (map[string]interface{}, error) { +func resourceIBMIsBareMetalServerReservedIPReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil diff --git a/ibm/service/vpc/resource_ibm_is_dedicated_host.go b/ibm/service/vpc/resource_ibm_is_dedicated_host.go index 09d1fec740..5a94188c04 100644 --- a/ibm/service/vpc/resource_ibm_is_dedicated_host.go +++ b/ibm/service/vpc/resource_ibm_is_dedicated_host.go @@ -635,7 +635,7 @@ func resourceIbmIsDedicatedHostInstanceReferenceToMap(instanceReference vpcv1.In return instanceReferenceMap } -func resourceIbmIsDedicatedHostInstanceReferenceDeletedToMap(instanceReferenceDeleted vpcv1.InstanceReferenceDeleted) map[string]interface{} { +func resourceIbmIsDedicatedHostInstanceReferenceDeletedToMap(instanceReferenceDeleted vpcv1.Deleted) map[string]interface{} { instanceReferenceDeletedMap := map[string]interface{}{} instanceReferenceDeletedMap["more_info"] = instanceReferenceDeleted.MoreInfo @@ -866,7 +866,7 @@ func resourceIbmIsDedicatedHostInstanceDiskReferenceToMap(instanceDiskReference return instanceDiskReferenceMap } -func resourceIbmIsDedicatedHostInstanceDiskReferenceDeletedToMap(instanceDiskReferenceDeleted vpcv1.InstanceDiskReferenceDeleted) map[string]interface{} { +func resourceIbmIsDedicatedHostInstanceDiskReferenceDeletedToMap(instanceDiskReferenceDeleted vpcv1.Deleted) map[string]interface{} { instanceDiskReferenceDeletedMap := map[string]interface{}{} instanceDiskReferenceDeletedMap["more_info"] = instanceDiskReferenceDeleted.MoreInfo diff --git a/ibm/service/vpc/resource_ibm_is_dedicated_host_group.go b/ibm/service/vpc/resource_ibm_is_dedicated_host_group.go index 5c769a973e..bfb0974e44 100644 --- a/ibm/service/vpc/resource_ibm_is_dedicated_host_group.go +++ b/ibm/service/vpc/resource_ibm_is_dedicated_host_group.go @@ -366,7 +366,7 @@ func resourceIbmIsDedicatedHostGroupDedicatedHostReferenceToMap(dedicatedHostRef return dedicatedHostReferenceMap } -func resourceIbmIsDedicatedHostGroupDedicatedHostReferenceDeletedToMap(dedicatedHostReferenceDeleted vpcv1.DedicatedHostReferenceDeleted) map[string]interface{} { +func resourceIbmIsDedicatedHostGroupDedicatedHostReferenceDeletedToMap(dedicatedHostReferenceDeleted vpcv1.Deleted) map[string]interface{} { dedicatedHostReferenceDeletedMap := map[string]interface{}{} dedicatedHostReferenceDeletedMap["more_info"] = dedicatedHostReferenceDeleted.MoreInfo diff --git a/ibm/service/vpc/resource_ibm_is_floating_ip.go b/ibm/service/vpc/resource_ibm_is_floating_ip.go index cbed74338c..b4adf1f0d2 100644 --- a/ibm/service/vpc/resource_ibm_is_floating_ip.go +++ b/ibm/service/vpc/resource_ibm_is_floating_ip.go @@ -850,7 +850,7 @@ func floatingIPCollectionFloatingIpTargetToMap(targetItemIntf vpcv1.FloatingIPTa return targetId, targetMap } -func floatingIPTargetNicDeletedToMap(deletedItem vpcv1.NetworkInterfaceReferenceDeleted) (deletedMap map[string]interface{}) { +func floatingIPTargetNicDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { @@ -859,7 +859,7 @@ func floatingIPTargetNicDeletedToMap(deletedItem vpcv1.NetworkInterfaceReference return deletedMap } -func floatingIPTargetPgDeletedToMap(deletedItem vpcv1.PublicGatewayReferenceDeleted) (deletedMap map[string]interface{}) { +func floatingIPTargetPgDeletedToMap(deletedItem vpcv1.Deleted) (deletedMap map[string]interface{}) { deletedMap = map[string]interface{}{} if deletedItem.MoreInfo != nil { diff --git a/ibm/service/vpc/resource_ibm_is_instance.go b/ibm/service/vpc/resource_ibm_is_instance.go index 3260ddc76a..fe23b877e1 100644 --- a/ibm/service/vpc/resource_ibm_is_instance.go +++ b/ibm/service/vpc/resource_ibm_is_instance.go @@ -6325,7 +6325,7 @@ func resourceIbmIsInstanceReservationAffinityPoolToMap(reservationPool vpcv1.Res return resAffPoolMap } -func resourceIbmIsInstanceDedicatedHostGroupReferenceDeletedToMap(dedicatedHostGroupReferenceDeleted vpcv1.DedicatedHostGroupReferenceDeleted) map[string]interface{} { +func resourceIbmIsInstanceDedicatedHostGroupReferenceDeletedToMap(dedicatedHostGroupReferenceDeleted vpcv1.Deleted) map[string]interface{} { dedicatedHostGroupReferenceDeletedMap := map[string]interface{}{} dedicatedHostGroupReferenceDeletedMap["more_info"] = dedicatedHostGroupReferenceDeleted.MoreInfo @@ -6434,7 +6434,7 @@ func resourceIBMIsInstanceInstanceNetworkAttachmentReferenceToMap(model *vpcv1.I return modelMap, nil } -func resourceIBMIsInstanceInstanceNetworkAttachmentReferenceDeletedToMap(model *vpcv1.InstanceNetworkAttachmentReferenceDeleted) (map[string]interface{}, error) { +func resourceIBMIsInstanceInstanceNetworkAttachmentReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -6460,7 +6460,7 @@ func resourceIBMIsInstanceReservedIPReferenceToMap(model *vpcv1.ReservedIPRefere return modelMap, nil } -func resourceIBMIsInstanceReservedIPReferenceDeletedToMap(model *vpcv1.ReservedIPReferenceDeleted) (map[string]interface{}, error) { +func resourceIBMIsInstanceReservedIPReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil diff --git a/ibm/service/vpc/resource_ibm_is_instance_network_attachment.go b/ibm/service/vpc/resource_ibm_is_instance_network_attachment.go index 5cfdcd1403..a0f76e2833 100644 --- a/ibm/service/vpc/resource_ibm_is_instance_network_attachment.go +++ b/ibm/service/vpc/resource_ibm_is_instance_network_attachment.go @@ -982,7 +982,7 @@ func resourceIBMIsInstanceNetworkAttachmentReservedIPReferenceToMap(model *vpcv1 return modelMap, nil } -func resourceIBMIsInstanceNetworkAttachmentReservedIPReferenceDeletedToMap(model *vpcv1.ReservedIPReferenceDeleted) (map[string]interface{}, error) { +func resourceIBMIsInstanceNetworkAttachmentReservedIPReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -1005,7 +1005,7 @@ func resourceIBMIsInstanceNetworkAttachmentSubnetReferenceToMap(model *vpcv1.Sub return modelMap, nil } -func resourceIBMIsInstanceNetworkAttachmentSubnetReferenceDeletedToMap(model *vpcv1.SubnetReferenceDeleted) (map[string]interface{}, error) { +func resourceIBMIsInstanceNetworkAttachmentSubnetReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil diff --git a/ibm/service/vpc/resource_ibm_is_instance_network_interface.go b/ibm/service/vpc/resource_ibm_is_instance_network_interface.go index 053a474f82..a6fc8256af 100644 --- a/ibm/service/vpc/resource_ibm_is_instance_network_interface.go +++ b/ibm/service/vpc/resource_ibm_is_instance_network_interface.go @@ -514,7 +514,7 @@ func resourceIBMIsInstanceNetworkInterfaceFloatingIPReferenceToMap(floatingIPRef return floatingIPReferenceMap } -func resourceIBMIsInstanceNetworkInterfaceFloatingIPReferenceDeletedToMap(floatingIPReferenceDeleted vpcv1.FloatingIPReferenceDeleted) map[string]interface{} { +func resourceIBMIsInstanceNetworkInterfaceFloatingIPReferenceDeletedToMap(floatingIPReferenceDeleted vpcv1.Deleted) map[string]interface{} { floatingIPReferenceDeletedMap := map[string]interface{}{} floatingIPReferenceDeletedMap["more_info"] = floatingIPReferenceDeleted.MoreInfo diff --git a/ibm/service/vpc/resource_ibm_is_lb_listener.go b/ibm/service/vpc/resource_ibm_is_lb_listener.go index 667c382d6c..889811dacd 100644 --- a/ibm/service/vpc/resource_ibm_is_lb_listener.go +++ b/ibm/service/vpc/resource_ibm_is_lb_listener.go @@ -939,7 +939,7 @@ func resourceIBMIsLbListenerLoadBalancerListenerReferenceToMap(model *vpcv1.Load modelMap["id"] = model.ID return modelMap, nil } -func resourceIBMIsLbListenerLoadBalancerListenerReferenceDeletedToMap(model *vpcv1.LoadBalancerListenerReferenceDeleted) (map[string]interface{}, error) { +func resourceIBMIsLbListenerLoadBalancerListenerReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil diff --git a/ibm/service/vpc/resource_ibm_is_lb_listener_policy.go b/ibm/service/vpc/resource_ibm_is_lb_listener_policy.go index 5c5ba0da2f..8e11b8d777 100644 --- a/ibm/service/vpc/resource_ibm_is_lb_listener_policy.go +++ b/ibm/service/vpc/resource_ibm_is_lb_listener_policy.go @@ -1223,7 +1223,7 @@ func resourceIBMIsLbListenerPolicyLoadBalancerListenerPolicyTargetToMap(model vp } } -func resourceIBMIsLbListenerPolicyLoadBalancerPoolReferenceDeletedToMap(model *vpcv1.LoadBalancerPoolReferenceDeleted) (map[string]interface{}, error) { +func resourceIBMIsLbListenerPolicyLoadBalancerPoolReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -1243,7 +1243,7 @@ func resourceIBMIsLbListenerPolicyLoadBalancerListenerReferenceToMap(model *vpcv return modelMap, nil } -func resourceIBMIsLbListenerPolicyLoadBalancerListenerReferenceDeletedToMap(model *vpcv1.LoadBalancerListenerReferenceDeleted) (map[string]interface{}, error) { +func resourceIBMIsLbListenerPolicyLoadBalancerListenerReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil diff --git a/ibm/service/vpc/resource_ibm_is_share.go b/ibm/service/vpc/resource_ibm_is_share.go index 080699d087..219185463c 100644 --- a/ibm/service/vpc/resource_ibm_is_share.go +++ b/ibm/service/vpc/resource_ibm_is_share.go @@ -2205,7 +2205,7 @@ func ResourceIBMIsShareRegionReferenceToMap(model *vpcv1.RegionReference) map[st modelMap["name"] = *model.Name return modelMap } -func ResourceIBMIsShareShareReferenceDeletedToMap(model *vpcv1.ShareReferenceDeleted) map[string]interface{} { +func ResourceIBMIsShareShareReferenceDeletedToMap(model *vpcv1.Deleted) map[string]interface{} { modelMap := make(map[string]interface{}) modelMap["more_info"] = *model.MoreInfo return modelMap diff --git a/ibm/service/vpc/resource_ibm_is_snapshot_consistency_group.go b/ibm/service/vpc/resource_ibm_is_snapshot_consistency_group.go index b7c38774e4..432f3ac224 100644 --- a/ibm/service/vpc/resource_ibm_is_snapshot_consistency_group.go +++ b/ibm/service/vpc/resource_ibm_is_snapshot_consistency_group.go @@ -746,7 +746,7 @@ func resourceIBMIsSnapshotConsistencyGroupSnapshotConsistencyGroupSnapshotsItemT return modelMap, nil } -func resourceIBMIsSnapshotConsistencyGroupSnapshotReferenceDeletedToMap(model *vpcv1.SnapshotReferenceDeleted) (map[string]interface{}, error) { +func resourceIBMIsSnapshotConsistencyGroupSnapshotReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) if model.MoreInfo != nil { modelMap["more_info"] = model.MoreInfo @@ -796,7 +796,7 @@ func resourceIBMIsSnapshotConsistencyGroupBackupPolicyPlanReferenceToMap(model * return modelMap, nil } -func resourceIBMIsSnapshotConsistencyGroupBackupPolicyPlanReferenceDeletedToMap(model *vpcv1.BackupPolicyPlanReferenceDeleted) (map[string]interface{}, error) { +func resourceIBMIsSnapshotConsistencyGroupBackupPolicyPlanReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil diff --git a/ibm/service/vpc/resource_ibm_is_virtual_network_interface.go b/ibm/service/vpc/resource_ibm_is_virtual_network_interface.go index b860dd2180..afa651f220 100644 --- a/ibm/service/vpc/resource_ibm_is_virtual_network_interface.go +++ b/ibm/service/vpc/resource_ibm_is_virtual_network_interface.go @@ -996,7 +996,7 @@ func resourceIBMIsVirtualNetworkInterfaceReservedIPReferenceToMap(model *vpcv1.R return modelMap, nil } -func resourceIBMIsVirtualNetworkInterfaceReservedIPReferenceDeletedToMap(model *vpcv1.ReservedIPReferenceDeleted) (map[string]interface{}, error) { +func resourceIBMIsVirtualNetworkInterfaceReservedIPReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -1018,7 +1018,7 @@ func resourceIBMIsVirtualNetworkInterfaceSecurityGroupReferenceToMap(model *vpcv return modelMap, nil } -func resourceIBMIsVirtualNetworkInterfaceSecurityGroupReferenceDeletedToMap(model *vpcv1.SecurityGroupReferenceDeleted) (map[string]interface{}, error) { +func resourceIBMIsVirtualNetworkInterfaceSecurityGroupReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -1059,7 +1059,7 @@ func resourceIBMIsVirtualNetworkInterfaceVirtualNetworkInterfaceTargetToMap(mode } } -func resourceIBMIsVirtualNetworkInterfaceShareMountTargetReferenceDeletedToMap(model *vpcv1.ShareMountTargetReferenceDeleted) (map[string]interface{}, error) { +func resourceIBMIsVirtualNetworkInterfaceShareMountTargetReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil @@ -1209,7 +1209,7 @@ func resourceIBMIsVirtualNetworkInterfaceVPCReferenceToMap(model *vpcv1.VPCRefer return modelMap, nil } -func resourceIBMIsVirtualNetworkInterfaceVPCReferenceDeletedToMap(model *vpcv1.VPCReferenceDeleted) (map[string]interface{}, error) { +func resourceIBMIsVirtualNetworkInterfaceVPCReferenceDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil diff --git a/ibm/service/vpc/resource_ibm_is_vpc.go b/ibm/service/vpc/resource_ibm_is_vpc.go index da9104f86c..9123b356f1 100644 --- a/ibm/service/vpc/resource_ibm_is_vpc.go +++ b/ibm/service/vpc/resource_ibm_is_vpc.go @@ -1849,7 +1849,7 @@ func resourceIBMIsVPCVPCReferenceDnsResolverContextToMap(model *vpcv1.VPCReferen return modelMap, nil } -func resourceIBMIsVPCVPCReferenceDnsResolverContextDeletedToMap(model *vpcv1.VPCReferenceDnsResolverContextDeleted) (map[string]interface{}, error) { +func resourceIBMIsVPCVPCReferenceDnsResolverContextDeletedToMap(model *vpcv1.Deleted) (map[string]interface{}, error) { modelMap := make(map[string]interface{}) modelMap["more_info"] = model.MoreInfo return modelMap, nil diff --git a/ibm/service/vpc/resource_ibm_is_vpc_routing_table_route.go b/ibm/service/vpc/resource_ibm_is_vpc_routing_table_route.go index dd5c23d053..bb7b4319f3 100644 --- a/ibm/service/vpc/resource_ibm_is_vpc_routing_table_route.go +++ b/ibm/service/vpc/resource_ibm_is_vpc_routing_table_route.go @@ -231,12 +231,12 @@ func resourceIBMISVPCRoutingTableRouteCreate(d *schema.ResourceData, meta interf if add, ok := d.GetOk(rNextHop); ok { item := add.(string) if net.ParseIP(item) == nil { - nhConnectionID := &vpcv1.RoutePrototypeNextHopRouteNextHopPrototypeVPNGatewayConnectionIdentity{ + nhConnectionID := &vpcv1.RouteNextHopPrototype{ ID: core.StringPtr(item), } createVpcRoutingTableRouteOptions.SetNextHop(nhConnectionID) } else { - nh := &vpcv1.RoutePrototypeNextHopRouteNextHopPrototypeRouteNextHopIP{ + nh := &vpcv1.RouteNextHopPrototype{ Address: core.StringPtr(item), } createVpcRoutingTableRouteOptions.SetNextHop(nh) diff --git a/ibm/service/vpc/resource_ibm_is_vpn_server.go b/ibm/service/vpc/resource_ibm_is_vpn_server.go index fa0042b9af..5c6713d25a 100644 --- a/ibm/service/vpc/resource_ibm_is_vpn_server.go +++ b/ibm/service/vpc/resource_ibm_is_vpn_server.go @@ -791,7 +791,7 @@ func resourceIBMIsVPNServerReservedIPReferenceToMap(reservedIPReference vpcv1.Re return reservedIPReferenceMap } -func resourceIBMIsVPNServerReservedIPReferenceDeletedToMap(reservedIPReferenceDeleted vpcv1.ReservedIPReferenceDeleted) map[string]interface{} { +func resourceIBMIsVPNServerReservedIPReferenceDeletedToMap(reservedIPReferenceDeleted vpcv1.Deleted) map[string]interface{} { reservedIPReferenceDeletedMap := map[string]interface{}{} reservedIPReferenceDeletedMap["more_info"] = reservedIPReferenceDeleted.MoreInfo @@ -817,7 +817,7 @@ func resourceIBMIsVPNServerVPCReferenceToMap(vpcRef vpcv1.VPCReference) map[stri return vpcMap } -func resourceIBMIsVPNServerVPCReferenceDeletedToMap(vpcRefDeleted vpcv1.VPCReferenceDeleted) map[string]interface{} { +func resourceIBMIsVPNServerVPCReferenceDeletedToMap(vpcRefDeleted vpcv1.Deleted) map[string]interface{} { vpcRefDeletedMap := map[string]interface{}{} vpcRefDeletedMap["more_info"] = vpcRefDeleted.MoreInfo return vpcRefDeletedMap diff --git a/version/version.go b/version/version.go index b25b667ab2..3f91a3b5bb 100644 --- a/version/version.go +++ b/version/version.go @@ -5,7 +5,7 @@ import ( ) // Version is the current provider main version -const Version = "1.69.1" +const Version = "1.70.0-beta0" // GitCommit is the git commit that was compiled. This will be filled in by the compiler. var GitCommit string diff --git a/website/docs/d/is_zone.html.markdown b/website/docs/d/is_zone.html.markdown index 68790a88fc..ee547e134f 100644 --- a/website/docs/d/is_zone.html.markdown +++ b/website/docs/d/is_zone.html.markdown @@ -41,3 +41,5 @@ Review the argument references that you can specify for your data source. In addition to all argument reference list, you can access the following attribute references after your data source is created. - `status` - (String) The status of the zone. +- `data_center` - (String) The physical data center assigned to this logical zone. If absent, no physical data center has been assigned. +- `universal_name` - (String) The universal name for this zone. Will be absent if this zone has a status of unassigned. diff --git a/website/docs/d/is_zones.html.markdown b/website/docs/d/is_zones.html.markdown index 057f859e6a..d23589d5e2 100644 --- a/website/docs/d/is_zones.html.markdown +++ b/website/docs/d/is_zones.html.markdown @@ -38,3 +38,9 @@ Review the argument references that you can specify for your data source. In addition to all argument reference list, you can access the following attribute references after your data source is created. - `zones` - (String) The list of zones in an IBM Cloud region. For example, **us-south-1**,**us-south-2**. +- `zone_info` - (List) Collection of zones. + Nested schema for **zone_info**: + - `data_center` - (String) The physical data center assigned to this logical zone. If absent, no physical data center has been assigned. + - `name` - (String) The name of the zone. + - `status` - (String) The status of the zone. + - `universal_name` - (String) The universal name for this zone. Will be absent if this zone has a status of unassigned.