fix: preserver api response while ordering node groups and zones

* fix: preserver api response while ordering node groups and zones

* test: add test cases for models

* fix: lint issues

* chore: sync and update latest graphql schema

Author: ianaya89

.github/workflows/test.yml

@@ -23,6 +23,8 @@ jobs:
           cache: true
       - run: go mod download
       - run: go build -v .
+      - name: Run tests
+        run: make test
       - name: Run linters
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8.0.0
         with:

Makefile

@@ -107,6 +107,10 @@ fmt:
 lint:
 	golangci-lint run
 
+.PHONY: test
+test:
+	go test -v -cover ./...
+
 .PHONY: help
 help:
 	@echo "Available commands:"
@@ -118,7 +122,8 @@ help:
 	@echo "gen               - Run SDK generation, version sync, and docs generation. This is a combined command that runs sdk, sync, and docs commands."
 	@echo "local             - Build the provider and set up the local directory for testing. This is useful for local development and testing."
 	@echo "sdk               - Re-sync the SDK client and models. This pulls the latest GraphQL schema and regenerates the client code."
-	@echo "testacc           - Run acceptance tests. These are integration tests that use the Terraform binary to test real infrastructure."
 	@echo "sync              - Fetch and update the current version in the 'example' directory. This syncs the version used in examples with the latest git tag."
+	@echo "test              - Run Go unit tests with coverage. This runs all unit tests in the project and provides coverage information."
+	@echo "testacc           - Run acceptance tests. These are integration tests that use the Terraform binary to test real infrastructure."
 	@echo "tool              - Run Go tools. This is a placeholder for any Go-based tools you might want to run as part of the build."
 

go.mod

@@ -15,6 +15,7 @@ require (
 	github.com/MakeNowJust/heredoc/v2 v2.0.1
 	github.com/hashicorp/terraform-plugin-framework-validators v0.18.0
 	github.com/hashicorp/terraform-plugin-testing v1.13.3
+	github.com/stretchr/testify v1.10.0
 )
 
 require (
@@ -33,6 +34,7 @@ require (
 	github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect
 	github.com/cloudflare/circl v1.6.1 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/fatih/color v1.16.0 // indirect
 	github.com/goccy/go-yaml v1.17.1 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
@@ -69,6 +71,7 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
 	github.com/oklog/run v1.0.0 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/posener/complete v1.2.3 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect

internal/provider/env/aws/model.go

@@ -320,15 +320,25 @@ func maintenanceWindowsToModel(input []*sdk.AWSEnvSpecFragment_MaintenanceWindow
 
 func reorderNodeGroups(model []common.NodeGroupsModel, nodeGroups []*sdk.AWSEnvSpecFragment_NodeGroups) []*sdk.AWSEnvSpecFragment_NodeGroups {
 	orderedNodeGroups := make([]*sdk.AWSEnvSpecFragment_NodeGroups, 0, len(nodeGroups))
+	usedNodeGroups := make(map[string]bool)
 
+	// First, add node groups that exist in the model in the correct order
 	for _, ng := range model {
 		for _, apiGroup := range nodeGroups {
 			if ng.NodeType.ValueString() == apiGroup.NodeType {
 				orderedNodeGroups = append(orderedNodeGroups, apiGroup)
+				usedNodeGroups[apiGroup.NodeType] = true
 				break
 			}
 		}
 	}
 
+	// Then, add any remaining node groups from the API that weren't in the model
+	for _, apiGroup := range nodeGroups {
+		if !usedNodeGroups[apiGroup.NodeType] {
+			orderedNodeGroups = append(orderedNodeGroups, apiGroup)
+		}
+	}
+
 	return orderedNodeGroups
 }