Chore: remove environment import (#918)

* Revert "Feat: add an environment import resource (#858)" This reverts commit 3a475d6 * Revert "Chore: add environment import api client (#855)" This reverts commit e37247b * add sets functions back * change order * double stuff
env0 · Jul 31, 2024 · 69de2e1 · 69de2e1
1 parent f1d24fc
commit 69de2e1
Show file tree

Hide file tree

Showing 12 changed files with 2,606 additions and 604 deletions.
diff --git a/client/api_client.go b/client/api_client.go
@@ -152,10 +152,6 @@ type ApiClientInterface interface {
 	TeamRoleAssignments(payload *TeamRoleAssignmentListPayload) ([]TeamRoleAssignmentPayload, error)
 	KubernetesCredentialsCreate(payload *KubernetesCredentialsCreatePayload) (*Credentials, error)
 	KubernetesCredentialsUpdate(id string, payload *KubernetesCredentialsUpdatePayload) (*Credentials, error)
-	EnvironmentImportCreate(payload *EnvironmentImportCreatePayload) (*EnvironmentImport, error)
-	EnvironmentImportUpdate(id string, payload *EnvironmentImportUpdatePayload) (*EnvironmentImport, error)
-	EnvironmentImportGet(id string) (*EnvironmentImport, error)
-	EnvironmentImportDelete(id string) error
 	ConfigurationSetCreate(payload *CreateConfigurationSetPayload) (*ConfigurationSet, error)
 	ConfigurationSetUpdate(id string, payload *UpdateConfigurationSetPayload) (*ConfigurationSet, error)
 	ConfigurationSet(id string) (*ConfigurationSet, error)

diff --git a/client/api_client_mock.go b/client/api_client_mock.go
diff --git a/client/environment_import.go b/client/environment_import.go
diff --git a/client/environment_import_test.go b/client/environment_import_test.go
diff --git a/env0/provider.go b/env0/provider.go
@@ -157,7 +157,6 @@ func Provider(version string) plugin.ProviderFunc {
 				"env0_aws_eks_credentials":                  resourceAwsEksCredentials(),
 				"env0_azure_aks_credentials":                resourceAzureAksCredentials(),
 				"env0_gcp_gke_credentials":                  resourceGcpGkeCredentials(),
-				"env0_environment_import":                   resourceEnvironmentImport(),
 				"env0_variable_set":                         resourceVariableSet(),
 				"env0_variable_set_assignment":              resourceVariableSetAssignment(),
 			},

diff --git a/env0/resource_environment.go b/env0/resource_environment.go
@@ -149,7 +149,7 @@ func resourceEnvironment() *schema.Resource {
 		UpdateContext: resourceEnvironmentUpdate,
 		DeleteContext: resourceEnvironmentDelete,
 
-		Importer: &schema.ResourceImporter{StateContext: resourceEnvironmentImporter},
+		Importer: &schema.ResourceImporter{StateContext: resourceEnvironmentImport},
 
 		Schema: map[string]*schema.Schema{
 			"id": {
@@ -1372,8 +1372,7 @@ func getEnvironmentById(environmentId string, meta interface{}) (client.Environm
 	return environment, nil
 }
 
-// a function to import an environment resource not to be consufed with the "environment import" resource (which is a different resource)
-func resourceEnvironmentImporter(ctx context.Context, d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+func resourceEnvironmentImport(ctx context.Context, d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
 	id := d.Id()
 	var getErr diag.Diagnostics