chore: should pass in space_id from config as it'll grab the space id…

… from the client if nil (#737)
OctopusDeployLabs · Aug 15, 2024 · 0678c06 · 0678c06
1 parent 6a770fa
commit 0678c06
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/octopusdeploy_framework/datasource_environments.go b/octopusdeploy_framework/datasource_environments.go
@@ -84,9 +84,7 @@ func (e *environmentDataSource) Read(ctx context.Context, req datasource.ReadReq
 		Take:        util.GetNumber(data.Take),
 	}
 
-	spaceID := util.Ternary(data.SpaceID.IsNull(), e.Client.GetSpaceID(), data.SpaceID.ValueString())
-
-	existingEnvironments, err := environments.Get(e.Client, spaceID, query)
+	existingEnvironments, err := environments.Get(e.Client, data.SpaceID.ValueString(), query)
 	if err != nil {
 		resp.Diagnostics.AddError("unable to load environments", err.Error())
 		return

diff --git a/octopusdeploy_framework/resource_variable.go b/octopusdeploy_framework/resource_variable.go
@@ -211,7 +211,7 @@ func (r *variableTypeResource) Delete(ctx context.Context, req resource.DeleteRe
 		return
 	}
 
-	if _, err := variables.DeleteSingle(r.Config.Client, r.Config.SpaceID, variableOwnerID.ValueString(), data.ID.ValueString()); err != nil {
+	if _, err := variables.DeleteSingle(r.Config.Client, data.SpaceID.ValueString(), variableOwnerID.ValueString(), data.ID.ValueString()); err != nil {
 		resp.Diagnostics.AddError("unable to delete variable", err.Error())
 		return
 	}
-Original file line number
+Diff line change
@@ Expand Up @@
     		return
     	}
-    	if _, err := variables.DeleteSingle(r.Config.Client, r.Config.SpaceID, variableOwnerID.ValueString(), data.ID.ValueString()); err != nil {
+    	if _, err := variables.DeleteSingle(r.Config.Client, data.SpaceID.ValueString(), variableOwnerID.ValueString(), data.ID.ValueString()); err != nil {
     		resp.Diagnostics.AddError("unable to delete variable", err.Error())
     		return
     	}
@@ Expand Down @@