fix: endpoint script was incorrectly marshalling the shape of its response

Author: burythehammer

privatelink_test.go

@@ -421,8 +421,6 @@ func TestGetActiveActivePrivateLink(t *testing.T) {
 }
 
 func TestGetPrivateLinkScript(t *testing.T) {
-	t.Skipf("skipping test until privatelink script is available")
-
 	tc := []struct {
 		description     string
 		mockedResponse  []endpointRequest
@@ -436,10 +434,51 @@ func TestGetPrivateLinkScript(t *testing.T) {
 				getRequest(
 					t,
 					"/subscriptions/114019/private-link/endpoint-script?includeTerraformAwsScript=true",
-					`a pro privatelink aws terraform endpoint script`,
+					`{
+				  "taskId": "4e62bd68-06ce-4207-91cd-62b9d8b60dff",
+				  "commandType": "privateLinkEndpointScriptGetRequest",
+				  "status": "received",
+				  "description": "Task request received and is being queued for processing.",
+				  "timestamp": "2025-10-30T14:13:46.539111211Z",
+				  "links": [
+					{
+					  "type": "GET",
+					  "href": "https://api-staging.qa.redislabs.com/v1/tasks/4e62bd68-06ce-4207-91cd-62b9d8b60dff",
+					  "rel": "task"
+					}
+				  ]
+				}`,
 				),
+				getRequest(
+					t,
+					"/tasks/4e62bd68-06ce-4207-91cd-62b9d8b60dff",
+					`{
+							  "taskId": "4e62bd68-06ce-4207-91cd-62b9d8b60dff",
+							  "commandType": "privateLinkEndpointScriptGetRequest",
+							  "status": "processing-completed",
+							  "description": "Request processing completed successfully and its resources are now being provisioned / de-provisioned.",
+							  "timestamp": "2025-10-30T14:13:51.991415541Z",
+							  "response": {
+								"resourceId": 114019,
+								"resource": {
+								  "resourceEndpointScript": "python script content here",
+								  "terraformAwsScript": "terraform script content here"
+								}
+							  },
+							  "links": [
+								{
+								  "type": "GET",
+								  "href": "https://api-staging.qa.redislabs.com/v1/tasks/4e62bd68-06ce-4207-91cd-62b9d8b60dff",
+								  "rel": "self"
+								}
+							  ]
+							}`,
+				),
+			},
+			expectedResult: &pl.PrivateLinkEndpointScript{
+				ResourceEndpointScript: redis.String("python script content here"),
+				TerraformAwsScript:     redis.String("terraform script content here"),
 			},
-			expectedResult: redis.String("a pro privatelink aws terraform endpoint script"),
 		},
 	}
 	for _, testCase := range tc {
@@ -464,8 +503,6 @@ func TestGetPrivateLinkScript(t *testing.T) {
 }
 
 func TestGetActiveActivePrivateLinkScript(t *testing.T) {
-	t.Skipf("skipping test until privatelink script is available")
-
 	tc := []struct {
 		description     string
 		mockedResponse  []endpointRequest
@@ -479,10 +516,51 @@ func TestGetActiveActivePrivateLinkScript(t *testing.T) {
 				getRequest(
 					t,
 					"/subscriptions/114019/regions/1/private-link/endpoint-script?includeTerraformAwsScript=true",
-					`an active active aws terraform endpoint script`,
+					`{
+				  "taskId": "5f73ce79-17df-5db1-a2de-18993ea71f00",
+				  "commandType": "activeActivePrivateLinkEndpointScriptGetRequest",
+				  "status": "received",
+				  "description": "Task request received and is being queued for processing.",
+				  "timestamp": "2025-10-30T14:13:46.539111211Z",
+				  "links": [
+					{
+					  "type": "GET",
+					  "href": "https://api-staging.qa.redislabs.com/v1/tasks/5f73ce79-17df-5db1-a2de-18993ea71f00",
+					  "rel": "task"
+					}
+				  ]
+				}`,
 				),
+				getRequest(
+					t,
+					"/tasks/5f73ce79-17df-5db1-a2de-18993ea71f00",
+					`{
+							  "taskId": "5f73ce79-17df-5db1-a2de-18993ea71f00",
+							  "commandType": "activeActivePrivateLinkEndpointScriptGetRequest",
+							  "status": "processing-completed",
+							  "description": "Request processing completed successfully and its resources are now being provisioned / de-provisioned.",
+							  "timestamp": "2025-10-30T14:13:51.991415541Z",
+							  "response": {
+								"resourceId": 114019,
+								"resource": {
+								  "resourceEndpointScript": "active active python script content here",
+								  "terraformAwsScript": "active active terraform script content here"
+								}
+							  },
+							  "links": [
+								{
+								  "type": "GET",
+								  "href": "https://api-staging.qa.redislabs.com/v1/tasks/5f73ce79-17df-5db1-a2de-18993ea71f00",
+								  "rel": "self"
+								}
+							  ]
+							}`,
+				),
+			},
+			expectedResult: &pl.PrivateLinkEndpointScript{
+				ResourceEndpointScript: redis.String("active active python script content here"),
+				TerraformAwsScript:     redis.String("active active terraform script content here"),
 			},
-			expectedResult: redis.String("an active active aws terraform endpoint script"),
 		},
 	}
 	for _, testCase := range tc {

service/privatelink/model.go

@@ -79,6 +79,11 @@ func (f *NotFoundActiveActive) Error() string {
 	return fmt.Sprintf("privatelink resource not found - subscription %d, region %d", f.subscriptionID, f.regionID)
 }
 
+type PrivateLinkEndpointScript struct {
+	ResourceEndpointScript *string `json:"resourceEndpointScript,omitempty"`
+	TerraformAwsScript     *string `json:"terraformAwsScript,omitempty"`
+}
+
 const (
 	// PrivateLinkStatusInitializing when PrivateLink is initialising
 	PrivateLinkStatusInitializing = "initializing"

service/privatelink/service.go

@@ -61,8 +61,6 @@ func (a *API) GetPrivateLink(ctx context.Context, subscription int) (*PrivateLin
 	return task, nil
 }
 
-type PrivateLinkEndpointScript = string
-
 // GetPrivateLinkEndpointScript will get the script for an endpoint.
 func (a *API) GetPrivateLinkEndpointScript(ctx context.Context, subscriptionId int) (*PrivateLinkEndpointScript, error) {
 	message := fmt.Sprintf("get private link for subscription %d", subscriptionId)
@@ -205,7 +203,7 @@ func (a *API) getScript(ctx context.Context, message string, path string) (*Priv
 		return nil, err
 	}
 
-	a.logger.Printf("Waiting for PrivateLink script get request %d to complete", task.ID)
+	a.logger.Printf("Waiting for PrivateLink script get request %s to complete", *task.ID)
 
 	var response PrivateLinkEndpointScript
 	err = a.taskWaiter.WaitForResource(ctx, *task.ID, &response)