bugfix: editing customer variables (#73)

nordcloud · Sep 17, 2024 · 24123de · 24123de
1 parent 2cf42e5
commit 24123de
Show file tree

Hide file tree

Showing 9 changed files with 116 additions and 11 deletions.
diff --git a/docs/resources/template.md b/docs/resources/template.md
@@ -162,7 +162,7 @@ resource "imagefactory_template" "azure_template" {
       additional_signatures {
         variable_name = imagefactory_variable.uefi_key.name
         # If the variable is not defined in the template, the value can be set directly
-        # variable_value = "UEFI_KEY"
+        # variable_name = "UEFI_KEY"
       }
     }
   }

diff --git a/examples/resources/imagefactory_template/resource.tf b/examples/resources/imagefactory_template/resource.tf
@@ -147,7 +147,7 @@ resource "imagefactory_template" "azure_template" {
       additional_signatures {
         variable_name = imagefactory_variable.uefi_key.name
         # If the variable is not defined in the template, the value can be set directly
-        # variable_value = "UEFI_KEY"
+        # variable_name = "UEFI_KEY"
       }
     }
   }

diff --git a/imagefactory/variable/resource.go b/imagefactory/variable/resource.go
@@ -1,4 +1,4 @@
-// Copyright 2022 Nordcloud Oy or its affiliates. All Rights Reserved.
+// Copyright 2022-2024 Nordcloud Oy or its affiliates. All Rights Reserved.
 
 package variable
 
@@ -79,7 +79,7 @@ func update(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Dia
 		}
 	}
 
-	input := sdk.NewVariable{
+	input := sdk.VariableChanges{
 		Name:  graphql.String(newVariableName),
 		Value: graphql.String(variableValue),
 	}

diff --git a/pkg/graphql/graphql.go b/pkg/graphql/graphql.go
diff --git a/pkg/graphql/schema.graphql b/pkg/graphql/schema.graphql
@@ -1297,7 +1297,7 @@ input TemplateChanges {
 }
 
 
-# Copyright 2021-2022 Nordcloud Oy or its affiliates. All Rights Reserved.
+# Copyright 2021-2024 Nordcloud Oy or its affiliates. All Rights Reserved.
 
 type Variable {
 	name: String!
@@ -1313,6 +1313,11 @@ input NewVariable {
 	value: String!
 }
 
+input VariableChanges {
+	name: String!
+	value: String!
+}
+
 
 # Copyright 2021-2023 Nordcloud Oy or its affiliates. All Rights Reserved.
 
@@ -1958,7 +1963,7 @@ extend type Query {
 }
 
 
-# Copyright 2021-2022 Nordcloud Oy or its affiliates. All Rights Reserved.
+# Copyright 2021-2024 Nordcloud Oy or its affiliates. All Rights Reserved.
 
 input CustomerVariableNameInput {
 	variableName: String!
@@ -1970,6 +1975,11 @@ extend type Mutation {
 	"""
 	createVariable(input: NewVariable!): Variable!
 
+	"""
+	updateVariable updates existing customer variable.
+	"""
+	updateVariable(input: VariableChanges!): Variable!
+
 	"""
 	deleteVariable removes existing customer variable.
 	"""

diff --git a/pkg/graphql/variable.graphql b/pkg/graphql/variable.graphql
@@ -1,4 +1,4 @@
-# Copyright 2022 Nordcloud Oy or its affiliates. All Rights Reserved.
+# Copyright 2022-2024 Nordcloud Oy or its affiliates. All Rights Reserved.
 
 query GetVariables {
   variables {
@@ -20,6 +20,13 @@ mutation CreateVariable($input: NewVariable!) {
   }
 }
 
+mutation UpdateVariable($input: VariableChanges!) {
+  updateVariable(input: $input) {
+    name
+    hash
+  }
+}
+
 mutation DeleteVariable($input: CustomerVariableNameInput!) {
   deleteVariable(input: $input)
 }
diff --git a/pkg/sdk/api.go b/pkg/sdk/api.go
@@ -55,7 +55,7 @@ type API interface {
 	// Variables CRUD
 	GetVariable(name string) (Variable, error)
 	CreateVariable(input NewVariable) (Variable, error)
-	UpdateVariable(input NewVariable) (Variable, error)
+	UpdateVariable(input VariableChanges) (Variable, error)
 	DeleteVariable(name string) error
 
 	// Actions

diff --git a/pkg/sdk/client.go b/pkg/sdk/client.go
@@ -668,8 +668,20 @@ func (c APIClient) CreateVariable(input NewVariable) (Variable, error) {
 	return Variable(r.CreateVariable), nil
 }
 
-func (c APIClient) UpdateVariable(input NewVariable) (Variable, error) {
-	return c.CreateVariable(input)
+func (c APIClient) UpdateVariable(input VariableChanges) (Variable, error) {
+	req, err := graphql.NewUpdateVariableRequest(c.apiURL, &graphql.UpdateVariableVariables{
+		Input: graphql.VariableChanges(input),
+	})
+	if err != nil {
+		return Variable{}, fmt.Errorf("getting update variable request %w", err)
+	}
+
+	r := &graphql.Mutation{}
+	if err := c.graphqlAPI.Execute(req.Request, r); err != nil {
+		return Variable{}, fmt.Errorf("updating variable %w", err)
+	}
+
+	return Variable(r.UpdateVariable), nil
 }
 
 func (c APIClient) DeleteVariable(name string) error {

diff --git a/pkg/sdk/model.go b/pkg/sdk/model.go
@@ -1,4 +1,4 @@
-// Copyright 2021-2023 Nordcloud Oy or its affiliates. All Rights Reserved.
+// Copyright 2021-2024 Nordcloud Oy or its affiliates. All Rights Reserved.
 
 package sdk
 
@@ -49,3 +49,5 @@ type APIKeyChanges graphql.ApiKeyChanges
 type Variable graphql.Variable
 
 type NewVariable graphql.NewVariable
+
+type VariableChanges graphql.VariableChanges