Fix LKE node pool tests (#556)

linode · Jul 19, 2024 · 166a6b0 · 166a6b0
1 parent da1ac32
commit 166a6b0
Show file tree

Hide file tree

Showing 7 changed files with 1,027 additions and 508 deletions.
diff --git a/test/integration/fixtures/TestLKENodePoolNode_Delete.yaml b/test/integration/fixtures/TestLKENodePoolNode_Delete.yaml
diff --git a/test/integration/fixtures/TestLKENodePool_CreateWithLabelsAndTaints.yaml b/test/integration/fixtures/TestLKENodePool_CreateWithLabelsAndTaints.yaml
diff --git a/test/integration/fixtures/TestLKENodePool_GetFound.yaml b/test/integration/fixtures/TestLKENodePool_GetFound.yaml
diff --git a/test/integration/fixtures/TestLKENodePool_GetMissing.yaml b/test/integration/fixtures/TestLKENodePool_GetMissing.yaml
@@ -22,6 +22,8 @@ interactions:
       - HEAD, GET, OPTIONS, POST, PUT, DELETE
       Access-Control-Allow-Origin:
       - '*'
+      Akamai-Internal-Account:
+      - '*'
       Cache-Control:
       - max-age=0, no-cache, no-store
       Connection:
@@ -31,7 +33,7 @@ interactions:
       Content-Type:
       - application/json
       Expires:
-      - Mon, 01 Jul 2024 17:48:55 GMT
+      - Fri, 19 Jul 2024 17:03:54 GMT
       Pragma:
       - no-cache
       Vary:

diff --git a/test/integration/fixtures/TestLKENodePool_Update.yaml b/test/integration/fixtures/TestLKENodePool_Update.yaml
diff --git a/test/integration/fixtures/TestLKENodePools_List.yaml b/test/integration/fixtures/TestLKENodePools_List.yaml
diff --git a/test/integration/lke_node_pools_test.go b/test/integration/lke_node_pools_test.go
@@ -39,7 +39,7 @@ func TestLKENodePool_GetMissing(t *testing.T) {
 }
 
 func TestLKENodePool_GetFound(t *testing.T) {
-	client, lkeCluster, pool, teardown, err := setupLKENodePool(t, "fixtures/TestLKENodePool_GetFound", nil)
+	client, lkeCluster, pool, teardown, err := setupLKENodePool(t, "fixtures/TestLKENodePool_GetFound", &testLKENodePoolCreateOpts)
 	if err != nil {
 		t.Error(err)
 	}
@@ -72,7 +72,7 @@ func TestLKENodePool_GetFound(t *testing.T) {
 }
 
 func TestLKENodePools_List(t *testing.T) {
-	client, lkeCluster, _, teardown, err := setupLKENodePool(t, "fixtures/TestLKENodePools_List", nil)
+	client, lkeCluster, _, teardown, err := setupLKENodePool(t, "fixtures/TestLKENodePools_List", &testLKENodePoolCreateOpts)
 	if err != nil {
 		t.Error(err)
 	}
@@ -88,7 +88,7 @@ func TestLKENodePools_List(t *testing.T) {
 }
 
 func TestLKENodePoolNode_Delete(t *testing.T) {
-	client, lkeCluster, nodePool, teardown, err := setupLKENodePool(t, "fixtures/TestLKENodePoolNode_Delete", nil)
+	client, lkeCluster, nodePool, teardown, err := setupLKENodePool(t, "fixtures/TestLKENodePoolNode_Delete", &testLKENodePoolCreateOpts)
 	if err != nil {
 		t.Error(err)
 	}
@@ -111,7 +111,7 @@ func TestLKENodePoolNode_Delete(t *testing.T) {
 }
 
 func TestLKENodePool_Update(t *testing.T) {
-	client, lkeCluster, nodePool, teardown, err := setupLKENodePool(t, "fixtures/TestLKENodePool_Update", nil)
+	client, lkeCluster, nodePool, teardown, err := setupLKENodePool(t, "fixtures/TestLKENodePool_Update", &testLKENodePoolCreateOpts)
 	if err != nil {
 		t.Error(err)
 	}
@@ -188,6 +188,8 @@ func TestLKENodePool_CreateWithLabelsAndTaints(t *testing.T) {
 			Value:  "bar",
 			Effect: linodego.LKENodePoolTaintEffectNoSchedule,
 		}},
+		Count: 1,
+		Type: "g6-standard-1",
 	}
 	_, _, nodePool, teardown, err := setupLKENodePool(t, "fixtures/TestLKENodePool_CreateWithLabelsAndTaints", createOpts)
 	if err != nil {
@@ -208,15 +210,12 @@ func setupLKENodePool(t *testing.T, fixturesYaml string, nodePoolCreateOpts *lin
 	var fixtureTeardown func()
 	client, lkeCluster, fixtureTeardown, err := setupLKECluster(t, []clusterModifier{func(createOpts *linodego.LKEClusterCreateOptions) {
 		createOpts.Label = "go-lke-test-def"
-		if nodePoolCreateOpts != nil {
-			createOpts.NodePools = []linodego.LKENodePoolCreateOptions{*nodePoolCreateOpts}
-		}
 	}}, fixturesYaml)
 	if err != nil {
 		t.Errorf("Error creating lkeCluster, got error %v", err)
 	}
 
-	pool, err := client.CreateLKENodePool(context.Background(), lkeCluster.ID, testLKENodePoolCreateOpts)
+	pool, err := client.CreateLKENodePool(context.Background(), lkeCluster.ID, *nodePoolCreateOpts)
 	if err != nil {
 		t.Errorf("Error creating LKE Node Pool, got error %v", err)
 	}