lint - replace deprecated ImportStatePassthrough with ImportStatePassthroughContext

ilia-medvedev-codefresh · ilia-medvedev-codefresh · commit d6fc468dd53c · 2025-05-12T11:57:06.000+03:00
diff --git a/codefresh/data_step_types.go b/codefresh/data_step_types.go
@@ -73,11 +73,11 @@ func dataSourceStepTypesRead(d *schema.ResourceData, meta interface{}) error {
 
 }
 
-func mapDataSetTypesToResource(stepTypesVersions cfclient.StepTypesVersions, d *schema.ResourceData) error {
-	err := d.Set("name", stepTypesVersions.Name)
-	if err != nil {
-		return err
-	}
-	err = d.Set("version", flattenVersions(stepTypesVersions.Name, stepTypesVersions.Versions))
-	return err
-}
+// func mapDataSetTypesToResource(stepTypesVersions cfclient.StepTypesVersions, d *schema.ResourceData) error {
+// 	err := d.Set("name", stepTypesVersions.Name)
+// 	if err != nil {
+// 		return err
+// 	}
+// 	err = d.Set("version", flattenVersions(stepTypesVersions.Name, stepTypesVersions.Versions))
+// 	return err
+// }
diff --git a/codefresh/resource_abac_rules.go b/codefresh/resource_abac_rules.go
@@ -21,7 +21,7 @@ func resourceGitopsAbacRule() *schema.Resource {
 		Update:      resourceGitopsAbacRuleUpdate,
 		Delete:      resourceGitopsAbacRuleDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
 			"id": {
diff --git a/codefresh/resource_account.go b/codefresh/resource_account.go
@@ -15,7 +15,7 @@ func resourceAccount() *schema.Resource {
 		Update: resourceAccountUpdate,
 		Delete: resourceAccountDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
 			"name": {
diff --git a/codefresh/resource_account_admins.go b/codefresh/resource_account_admins.go
@@ -16,7 +16,7 @@ func resourceAccountAdmins() *schema.Resource {
 		Update: resourceAccountAdminsUpdate,
 		Delete: resourceAccountAdminsDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
 			"account_id": {
diff --git a/codefresh/resource_account_gitops_settings.go b/codefresh/resource_account_gitops_settings.go
@@ -18,7 +18,7 @@ func resourceAccountGitopsSettings() *schema.Resource {
 		Create:      resourceAccountGitopsSettingsUpdate,
 		Update:      resourceAccountGitopsSettingsUpdate,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		// Delete not implemenented as gitops settings cannot be removed, only updated
 		Delete: resourceAccountGitopsSettingsDelete,
diff --git a/codefresh/resource_account_idp.go b/codefresh/resource_account_idp.go
@@ -21,7 +21,7 @@ func resourceAccountIdp() *schema.Resource {
 		Update:      resourceAccountIDPUpdate,
 		Delete:      resourceAccountIDPDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		CustomizeDiff: customdiff.All(
 			// Recreate idp if the type has changed - we cannot simply do ForceNew on client_type as it is computed
diff --git a/codefresh/resource_account_user_association.go b/codefresh/resource_account_user_association.go
@@ -19,7 +19,7 @@ func resourceAccountUserAssociation() *schema.Resource {
 		Update: resourceAccountUserAssociationUpdate,
 		Delete: resourceAccountUserAssociationDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
 			"email": {
diff --git a/codefresh/resource_api_key.go b/codefresh/resource_api_key.go
@@ -22,7 +22,7 @@ func resourceApiKey() *schema.Resource {
 		Update: resourceApiKeyUpdate,
 		Delete: resourceApiKeyDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
 			"name": {
diff --git a/codefresh/resource_context.go b/codefresh/resource_context.go
@@ -48,7 +48,7 @@ func resourceContext() *schema.Resource {
 		Update:      resourceContextUpdate,
 		Delete:      resourceContextDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
 			"name": {
diff --git a/codefresh/resource_idp.go b/codefresh/resource_idp.go
@@ -22,7 +22,7 @@ func resourceIdp() *schema.Resource {
 		Update:      resourceIDPUpdate,
 		Delete:      resourceIDPDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		CustomizeDiff: customdiff.All(
 			// Recreate idp if the type has changed - we cannot simply do ForceNew on client_type as it is computed
diff --git a/codefresh/resource_idp_accounts.go b/codefresh/resource_idp_accounts.go
@@ -17,7 +17,7 @@ Because of the current Codefresh API limitation it's impossible to remove accoun
 		Update: resourceIDPAccountsUpdate,
 		Delete: resourceIDPAccountsDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
 			"idp_id": {
diff --git a/codefresh/resource_permission.go b/codefresh/resource_permission.go
@@ -21,7 +21,7 @@ func resourcePermission() *schema.Resource {
 		Update:      resourcePermissionUpdate,
 		Delete:      resourcePermissionDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
 			"_id": {
diff --git a/codefresh/resource_pipeline.go b/codefresh/resource_pipeline.go
@@ -29,7 +29,7 @@ func resourcePipeline() *schema.Resource {
 		Update:      resourcePipelineUpdate,
 		Delete:      resourcePipelineDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
 			"name": {
@@ -1392,13 +1392,6 @@ func getSupportedTerminationPolicyAttributes(policy string) map[string]interface
 	return nil
 }
 
-func convertOnCreateBranchAttributeToResourceFormat(src string) string {
-	var re = regexp.MustCompile(`_[a-z]`)
-	return re.ReplaceAllStringFunc(src, func(w string) string {
-		return strings.ToUpper(strings.ReplaceAll(w, "_", ""))
-	})
-}
-
 func convertOnCreateBranchAttributeToPipelineFormat(src string) string {
 	var re = regexp.MustCompile(`[A-Z]`)
 	return re.ReplaceAllStringFunc(src, func(w string) string {
diff --git a/codefresh/resource_pipeline_test.go b/codefresh/resource_pipeline_test.go
@@ -1486,36 +1486,6 @@ resource "codefresh_pipeline" "test" {
 `, rName, repo, path, revision, context, ignoreTrigger)
 }
 
-func testAccCodefreshPipelineOnCreateBranchIgnoreTriggerWithBranchName(rName, repo, path, revision, context, branchName string, ignoreTrigger bool) string {
-	return fmt.Sprintf(`
-resource "codefresh_pipeline" "test" {
-
-  lifecycle {
-    ignore_changes = [
-      revision
-    ]
-  }
-
-  name = "%s"
-
-  spec {
-	spec_template {
-    	repo        = %q
-    	path        = %q
-    	revision    = %q
-    	context     = %q
-	}
-	termination_policy {
-		on_create_branch {
-			branch_nane = %q
-			ignore_trigger = %t
-		}
-	}
-  }
-}
-`, rName, repo, path, revision, context, branchName, ignoreTrigger)
-}
-
 func testAccCodefreshPipelineIsPublic(rName, repo, path, revision, context string, isPublic bool) string {
 	return fmt.Sprintf(`
 resource "codefresh_pipeline" "test" {
diff --git a/codefresh/resource_project.go b/codefresh/resource_project.go
@@ -23,7 +23,7 @@ You are free to use projects as you see fit. For example, you could create a pro
 		Update: resourceProjectUpdate,
 		Delete: resourceProjectDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
 			"name": {
diff --git a/codefresh/resource_registry.go b/codefresh/resource_registry.go
@@ -36,7 +36,7 @@ func resourceRegistry() *schema.Resource {
 		Update:      resourceRegistryUpdate,
 		Delete:      resourceRegistryDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
 			"name": {
diff --git a/codefresh/resource_service_account.go b/codefresh/resource_service_account.go
@@ -16,7 +16,7 @@ func resourceServiceAccount() *schema.Resource {
 		Update:      resourceServiceAccountUpdate,
 		Delete:      resourceServiceAccountDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
 			"name": {
diff --git a/codefresh/resource_step_types.go b/codefresh/resource_step_types.go
@@ -30,7 +30,7 @@ The resource allows to handle the life-cycle of the version by allowing specifyi
 		UpdateContext: resourceStepTypesUpdate,
 		DeleteContext: resourceStepTypesDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
 			"name": {
diff --git a/codefresh/resource_team.go b/codefresh/resource_team.go
@@ -16,7 +16,7 @@ func resourceTeam() *schema.Resource {
 		Update:      resourceTeamUpdate,
 		Delete:      resourceTeamDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
 			"name": {
diff --git a/codefresh/resource_user.go b/codefresh/resource_user.go
@@ -17,7 +17,7 @@ func resourceUser() *schema.Resource {
 		Update:      resourceUsersUpdate,
 		Delete:      resourceUsersDelete,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			StateContext: schema.ImportStatePassthroughContext,
 		},
 		Schema: map[string]*schema.Schema{
 			"user_name": {
