fix: dont grab variable in incorrect scope

Author: sullivtr

e2e/run_test.sh

@@ -13,7 +13,6 @@ trap "echo \"Stopping graphql test server (PPID $SERVER_PPID)\" ; pkill -P $SERV
 
 sleep 2
 cd ..
-# go test -i
 go test
 
 exit_status=$?

e2e/test_paginated/test.tf

@@ -15,7 +15,7 @@ provider "graphql" {
 }
 
 resource "graphql_mutation" "basic_mutation" {
-  compute_from_create = var.compute_from_create
+  compute_from_create = false
   mutation_variables = {
     "text" = var.todo_text
     "userId" = var.todo_user_id
@@ -37,7 +37,7 @@ resource "graphql_mutation" "basic_mutation" {
 }
 
 resource "graphql_mutation" "basic_mutation_2" {
-  compute_from_create = var.compute_from_create
+  compute_from_create = false
   mutation_variables = {
     "text" = var.todo_text
     "userId" = var.todo_user_id_2

graphql/data_source_graphql_query.go

@@ -40,7 +40,8 @@ func dataSourceGraphql() *schema.Resource {
 
 func dataSourceGraphqlQuery(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
 	var diags diag.Diagnostics
-	queryResponse, resBytes, err := queryExecute(ctx, d, m, "query", "query_variables")
+	paginated := d.Get("paginated").(bool)
+	queryResponse, resBytes, err := queryExecute(ctx, d, m, "query", "query_variables", paginated)
 	if err != nil {
 		return diag.FromErr(err)
 	}

graphql/gql_query.go

@@ -22,7 +22,7 @@ type GqlError struct {
 
 func (r *GqlQueryResponse) ProcessErrors() *diag.Diagnostics {
 	var diags diag.Diagnostics
-	if r.Errors != nil && len(r.Errors) > 0 {
+	if len(r.Errors) > 0 {
 		for _, queryErr := range r.Errors {
 			msg := fmt.Sprintf("graphql server error: %s", queryErr.Message)
 			diags = append(diags, diag.Diagnostic{Summary: msg, Severity: diag.Error, Detail: msg})

graphql/provider.go

@@ -62,7 +62,7 @@ func graphqlConfigure(ctx context.Context, d *schema.ResourceData) (interface{},
 	oauth2LoginQueryValueAttribute := d.Get("oauth2_login_query_value_attribute").(string)
 
 	if oauth2LoginQuery != "" && len(oauth2LoginQueryVariables) > 0 && oauth2LoginQueryValueAttribute != "" {
-		queryResponse, _, err := queryExecute(ctx, d, config, "oauth2_login_query", "oauth2_login_query_variables")
+		queryResponse, _, err := queryExecute(ctx, d, config, "oauth2_login_query", "oauth2_login_query_variables", false)
 		if err != nil {
 			return nil, diag.FromErr(fmt.Errorf("unable to execute oauth2_login_query: %w", err))
 		}

graphql/query_executor.go

@@ -13,15 +13,14 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
-func queryExecute(ctx context.Context, d *schema.ResourceData, m interface{}, querySource, variableSource string) (*GqlQueryResponse, []byte, error) {
+func queryExecute(ctx context.Context, d *schema.ResourceData, m interface{}, querySource, variableSource string, usePagination bool) (*GqlQueryResponse, []byte, error) {
 	query := d.Get(querySource).(string)
 	inputVariables := d.Get(variableSource).(map[string]interface{})
 	apiURL := m.(*graphqlProviderConfig).GQLServerUrl
 	headers := m.(*graphqlProviderConfig).RequestHeaders
 	authorizationHeaders := m.(*graphqlProviderConfig).RequestAuthorizationHeaders
-	paginated := d.Get("paginated").(bool)
 
-	if paginated {
+	if usePagination {
 		return executePaginatedQuery(ctx, query, inputVariables, apiURL, headers, authorizationHeaders)
 	}
 	return executeSingleQuery(ctx, query, inputVariables, apiURL, headers, authorizationHeaders)

graphql/resource_graphql_mutation.go

@@ -175,7 +175,7 @@ func resourceGraphqlRead(ctx context.Context, d *schema.ResourceData, m interfac
 		return diag.FromErr(fmt.Errorf("unable to set computed_read_operation_variables: %w", err))
 	}
 
-	queryResponse, resBytes, err := queryExecute(ctx, d, m, "read_query", "computed_read_operation_variables")
+	queryResponse, resBytes, err := queryExecute(ctx, d, m, "read_query", "computed_read_operation_variables", false)
 	if err != nil {
 		return diag.FromErr(fmt.Errorf("unable to execute read query: %w", err))
 	}
@@ -254,7 +254,7 @@ func resourceGraphqlMutationDelete(ctx context.Context, d *schema.ResourceData,
 }
 
 func executeCreateHook(ctx context.Context, d *schema.ResourceData, m interface{}) ([]byte, diag.Diagnostics) {
-	queryResponse, resBytes, err := queryExecute(ctx, d, m, "create_mutation", "mutation_variables")
+	queryResponse, resBytes, err := queryExecute(ctx, d, m, "create_mutation", "mutation_variables", false)
 	if err != nil {
 		return nil, diag.FromErr(fmt.Errorf("unable to execute create query: %w", err))
 	}
@@ -288,7 +288,7 @@ func executeUpdateHook(ctx context.Context, d *schema.ResourceData, m interface{
 		return nil, diag.FromErr(fmt.Errorf("unable to set computed_update_operation_variables: %w", err))
 	}
 
-	queryResponse, resBytes, err := queryExecute(ctx, d, m, "update_mutation", "computed_update_operation_variables")
+	queryResponse, resBytes, err := queryExecute(ctx, d, m, "update_mutation", "computed_update_operation_variables", false)
 	if err != nil {
 		return nil, diag.FromErr(fmt.Errorf("unable to execute update query: %w", err))
 	}
@@ -300,7 +300,7 @@ func executeUpdateHook(ctx context.Context, d *schema.ResourceData, m interface{
 }
 
 func executeDeleteHook(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
-	queryResponse, _, err := queryExecute(ctx, d, m, "delete_mutation", "computed_delete_operation_variables")
+	queryResponse, _, err := queryExecute(ctx, d, m, "delete_mutation", "computed_delete_operation_variables", false)
 	if err != nil {
 		return diag.FromErr(fmt.Errorf("unable to execute delete query: %w", err))
 	}