add rest api relation to apigateway adapters

Author: tomasdembelli

adapters/apigateway-authorizer.go

@@ -27,7 +27,7 @@ func convertGetAuthorizerOutputToAuthorizer(output *apigateway.GetAuthorizerOutp
 	}
 }
 
-func authorizerOutputMapper(scope string, awsItem *types.Authorizer) (*sdp.Item, error) {
+func authorizerOutputMapper(query, scope string, awsItem *types.Authorizer) (*sdp.Item, error) {
 	attributes, err := adapterhelpers.ToAttributesWithExclude(awsItem, "tags")
 	if err != nil {
 		return nil, err
@@ -40,6 +40,20 @@ func authorizerOutputMapper(scope string, awsItem *types.Authorizer) (*sdp.Item,
 		Scope:           scope,
 	}
 
+	item.LinkedItemQueries = append(item.LinkedItemQueries, &sdp.LinkedItemQuery{
+		Query: &sdp.Query{
+			Type:   "apigateway-rest-api",
+			Method: sdp.QueryMethod_GET,
+			Query:  strings.Split(query, "/")[0],
+			Scope:  scope,
+		},
+		BlastPropagation: &sdp.BlastPropagation{
+			// They are tightly coupled, so we need to propagate the blast to the linked item
+			In:  true,
+			Out: true,
+		},
+	})
+
 	return &item, nil
 }
 
@@ -107,8 +121,8 @@ func NewAPIGatewayAuthorizerAdapter(client *apigateway.Client, accountID string,
 
 			return items, nil
 		},
-		ItemMapper: func(_, scope string, awsItem *types.Authorizer) (*sdp.Item, error) {
-			return authorizerOutputMapper(scope, awsItem)
+		ItemMapper: func(query, scope string, awsItem *types.Authorizer) (*sdp.Item, error) {
+			return authorizerOutputMapper(query, scope, awsItem)
 		},
 	}
 }

adapters/apigateway-authorizer_test.go

@@ -1,6 +1,7 @@
 package adapters
 
 import (
+	"github.com/overmindtech/sdp-go"
 	"testing"
 	"time"
 
@@ -24,14 +25,25 @@ func TestAuthorizerOutputMapper(t *testing.T) {
 		AuthorizerResultTtlInSeconds: aws.Int32(300),
 	}
 
-	item, err := authorizerOutputMapper("scope", awsItem)
+	item, err := authorizerOutputMapper("rest-api-id", "scope", awsItem)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
 	if err := item.Validate(); err != nil {
 		t.Error(err)
 	}
+
+	tests := adapterhelpers.QueryTests{
+		{
+			ExpectedType:   "apigateway-rest-api",
+			ExpectedMethod: sdp.QueryMethod_GET,
+			ExpectedQuery:  "rest-api-id",
+			ExpectedScope:  "scope",
+		},
+	}
+
+	tests.Execute(t, item)
 }
 
 func TestNewAPIGatewayAuthorizerAdapter(t *testing.T) {

adapters/apigateway-deployment.go

@@ -21,7 +21,7 @@ func convertGetDeploymentOutputToDeployment(output *apigateway.GetDeploymentOutp
 	}
 }
 
-func deploymentOutputMapper(scope string, awsItem *types.Deployment) (*sdp.Item, error) {
+func deploymentOutputMapper(query, scope string, awsItem *types.Deployment) (*sdp.Item, error) {
 	attributes, err := adapterhelpers.ToAttributesWithExclude(awsItem, "tags")
 	if err != nil {
 		return nil, err
@@ -34,6 +34,20 @@ func deploymentOutputMapper(scope string, awsItem *types.Deployment) (*sdp.Item,
 		Scope:           scope,
 	}
 
+	item.LinkedItemQueries = append(item.LinkedItemQueries, &sdp.LinkedItemQuery{
+		Query: &sdp.Query{
+			Type:   "apigateway-rest-api",
+			Method: sdp.QueryMethod_GET,
+			Query:  strings.Split(query, "/")[0],
+			Scope:  scope,
+		},
+		BlastPropagation: &sdp.BlastPropagation{
+			// They are tightly coupled, so we need to propagate the blast to the linked item
+			In:  true,
+			Out: true,
+		},
+	})
+
 	return &item, nil
 }
 
@@ -101,8 +115,8 @@ func NewAPIGatewayDeploymentAdapter(client *apigateway.Client, accountID string,
 
 			return items, nil
 		},
-		ItemMapper: func(_, scope string, awsItem *types.Deployment) (*sdp.Item, error) {
-			return deploymentOutputMapper(scope, awsItem)
+		ItemMapper: func(query, scope string, awsItem *types.Deployment) (*sdp.Item, error) {
+			return deploymentOutputMapper(query, scope, awsItem)
 		},
 	}
 }

adapters/apigateway-deployment_test.go

@@ -1,6 +1,7 @@
 package adapters
 
 import (
+	"github.com/overmindtech/sdp-go"
 	"testing"
 	"time"
 
@@ -18,14 +19,25 @@ func TestDeploymentOutputMapper(t *testing.T) {
 		ApiSummary:  map[string]map[string]types.MethodSnapshot{},
 	}
 
-	item, err := deploymentOutputMapper("scope", awsItem)
+	item, err := deploymentOutputMapper("rest-api-id", "scope", awsItem)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
 
 	if err := item.Validate(); err != nil {
 		t.Error(err)
 	}
+
+	tests := adapterhelpers.QueryTests{
+		{
+			ExpectedType:   "apigateway-rest-api",
+			ExpectedMethod: sdp.QueryMethod_GET,
+			ExpectedQuery:  "rest-api-id",
+			ExpectedScope:  "scope",
+		},
+	}
+
+	tests.Execute(t, item)
 }
 
 func TestNewAPIGatewayDeploymentAdapter(t *testing.T) {

adapters/apigateway-resource.go

@@ -73,6 +73,20 @@ func resourceOutputMapper(query, scope string, awsItem *types.Resource) (*sdp.It
 		}
 	}
 
+	item.LinkedItemQueries = append(item.LinkedItemQueries, &sdp.LinkedItemQuery{
+		Query: &sdp.Query{
+			Type:   "apigateway-rest-api",
+			Method: sdp.QueryMethod_GET,
+			Query:  restApiID,
+			Scope:  scope,
+		},
+		BlastPropagation: &sdp.BlastPropagation{
+			// They are tightly coupled, so we need to propagate the blast to the linked item
+			In:  true,
+			Out: true,
+		},
+	})
+
 	return &item, nil
 }
 

adapters/apigateway-resource_test.go

@@ -1,6 +1,7 @@
 package adapters
 
 import (
+	"github.com/overmindtech/sdp-go"
 	"testing"
 	"time"
 
@@ -152,14 +153,25 @@ func TestResourceOutputMapper(t *testing.T) {
 		},
 	}
 
-	item, err := resourceOutputMapper("rest-api-13", "scope", resource)
+	item, err := resourceOutputMapper("rest-api-id", "scope", resource)
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	if err := item.Validate(); err != nil {
 		t.Error(err)
 	}
+
+	tests := adapterhelpers.QueryTests{
+		{
+			ExpectedType:   "apigateway-rest-api",
+			ExpectedMethod: sdp.QueryMethod_GET,
+			ExpectedQuery:  "rest-api-id",
+			ExpectedScope:  "scope",
+		},
+	}
+
+	tests.Execute(t, item)
 }
 
 func TestNewAPIGatewayResourceAdapter(t *testing.T) {