Merge branch 'master' into strorage-conn

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))

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

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=

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")

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,18 +465,18 @@ 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 {
 				return diag.FromErr(err)
 			}
 			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 {

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"),
 				),

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")

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))

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 {

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)

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)
 		}

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 {

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})
 

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 {

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 {

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 {