Address Polaris AWS API changes (#83)

rubrikinc · Mar 17, 2022 · 8b0c9ee · 8b0c9ee
1 parent 1936263
commit 8b0c9ee
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 8 deletions.
diff --git a/pkg/polaris/graphql/aws/cloud.go b/pkg/polaris/graphql/aws/cloud.go
@@ -205,6 +205,8 @@ func (a API) FinalizeCloudAccountProtection(ctx context.Context, id, name string
 	query := finalizeAwsCloudAccountProtectionQuery
 	if graphql.VersionOlderThan(a.Version, "master-46133", "v20220315") {
 		query = finalizeAwsCloudAccountProtectionV0Query
+	} else if graphql.VersionOlderThan(a.Version, "master-46203", "v20220322") {
+		query = finalizeAwsCloudAccountProtectionV1Query
 	}
 	buf, err := a.GQL.Request(ctx, query, struct {
 		ID             string           `json:"nativeId"`
@@ -331,6 +333,8 @@ func (a API) UpdateCloudAccount(ctx context.Context, action core.CloudAccountAct
 	query := updateAwsCloudAccountQuery
 	if graphql.VersionOlderThan(a.Version, "master-46133", "v20220315") {
 		query = updateAwsCloudAccountV0Query
+	} else if graphql.VersionOlderThan(a.Version, "master-46203", "v20220322") {
+		query = updateAwsCloudAccountV1Query
 	}
 	buf, err := a.GQL.Request(ctx, query, struct {
 		Action  core.CloudAccountAction `json:"action"`
@@ -383,15 +387,19 @@ type VPC struct {
 func (a API) AllVpcsByRegion(ctx context.Context, id uuid.UUID, regions Region) ([]VPC, error) {
 	a.GQL.Log().Print(log.Trace)
 
-	buf, err := a.GQL.Request(ctx, allVpcsByRegionFromAwsQuery, struct {
+	query := allVpcsByRegionFromAwsQuery
+	if graphql.VersionOlderThan(a.Version, "master-46203", "v20220322") {
+		query = allVpcsByRegionFromAwsV0Query
+	}
+	buf, err := a.GQL.Request(ctx, query, struct {
 		ID     uuid.UUID `json:"awsAccountRubrikId"`
 		Region Region    `json:"region"`
 	}{ID: id, Region: regions})
 	if err != nil {
 		return nil, fmt.Errorf("failed to request AllVpcsByRegion: %v", err)
 	}
 
-	a.GQL.Log().Printf(log.Debug, "allVpcsByRegionFromAws(%q, %q): %s", id, regions, string(buf))
+	a.GQL.Log().Printf(log.Debug, "%s(%q, %q): %s", graphql.QueryName(query), id, regions, string(buf))
 
 	var payload struct {
 		Data struct {

diff --git a/pkg/polaris/graphql/aws/queries.go b/pkg/polaris/graphql/aws/queries.go
diff --git a/pkg/polaris/graphql/aws/queries/all_vpcs_by_region_from_aws.graphql b/pkg/polaris/graphql/aws/queries/all_vpcs_by_region_from_aws.graphql
@@ -1,4 +1,4 @@
-query RubrikPolarisSDKRequest($awsAccountRubrikId: UUID!, $region: AwsNativeRegionEnum!) {
+query RubrikPolarisSDKRequest($awsAccountRubrikId: UUID!, $region: AwsNativeRegion!) {
     allVpcsByRegionFromAws(awsAccountRubrikId: $awsAccountRubrikId, region: $region) {
         id
         name

diff --git a/pkg/polaris/graphql/aws/queries/all_vpcs_by_region_from_aws_v0.graphql b/pkg/polaris/graphql/aws/queries/all_vpcs_by_region_from_aws_v0.graphql
@@ -0,0 +1,15 @@
+query RubrikPolarisSDKRequest($awsAccountRubrikId: UUID!, $region: AwsNativeRegionEnum!) {
+    allVpcsByRegionFromAws(awsAccountRubrikId: $awsAccountRubrikId, region: $region) {
+        id
+        name
+        subnets {
+            id
+            name
+            availabilityZone
+        }
+        securityGroups {
+            id
+            name
+        }
+    }
+}
diff --git a/pkg/polaris/graphql/aws/queries/finalize_aws_cloud_account_protection.graphql b/pkg/polaris/graphql/aws/queries/finalize_aws_cloud_account_protection.graphql
@@ -1,4 +1,4 @@
-mutation RubrikPolarisSDKRequest($nativeId: String!, $accountName: String!, $awsRegions: [AwsCloudAccountRegionEnum!], $externalId: String!, $featureVersion: [AwsCloudAccountFeatureVersionInput!]!, $feature: CloudAccountFeature!, $stackName: String!) {
+mutation RubrikPolarisSDKRequest($nativeId: String!, $accountName: String!, $awsRegions: [AwsCloudAccountRegion!], $externalId: String!, $featureVersion: [AwsCloudAccountFeatureVersionInput!]!, $feature: CloudAccountFeature!, $stackName: String!) {
     finalizeAwsCloudAccountProtection(input: {
         action: CREATE,
         awsChildAccounts: [{

diff --git a/pkg/polaris/graphql/aws/queries/finalize_aws_cloud_account_protection_v1.graphql b/pkg/polaris/graphql/aws/queries/finalize_aws_cloud_account_protection_v1.graphql
@@ -0,0 +1,21 @@
+mutation RubrikPolarisSDKRequest($nativeId: String!, $accountName: String!, $awsRegions: [AwsCloudAccountRegionEnum!], $externalId: String!, $featureVersion: [AwsCloudAccountFeatureVersionInput!]!, $feature: CloudAccountFeature!, $stackName: String!) {
+    finalizeAwsCloudAccountProtection(input: {
+        action: CREATE,
+        awsChildAccounts: [{
+            accountName: $accountName,
+            nativeId: $nativeId,
+        }],
+        awsRegions: $awsRegions,
+        externalId: $externalId,
+        featureVersion: $featureVersion,
+        features: [$feature],
+        stackName: $stackName,
+    }) {
+       awsChildAccounts {
+           accountName
+           nativeId
+           message
+       }
+       message
+    }
+}
diff --git a/pkg/polaris/graphql/aws/queries/update_aws_cloud_account.graphql b/pkg/polaris/graphql/aws/queries/update_aws_cloud_account.graphql
@@ -1,4 +1,4 @@
-mutation RubrikPolarisSDKRequest($action: CloudAccountActionEnum!, $cloudAccountId: UUID!, $awsRegions: [AwsCloudAccountRegionEnum!]!, $feature: CloudAccountFeature!) {
+mutation RubrikPolarisSDKRequest($action: CloudAccountAction!, $cloudAccountId: UUID!, $awsRegions: [AwsCloudAccountRegion!]!, $feature: CloudAccountFeature!) {
     updateAwsCloudAccount(input: {action: $action, cloudAccountId: $cloudAccountId, awsRegions: $awsRegions, feature: $feature}) {
         message
     }

diff --git a/pkg/polaris/graphql/aws/queries/update_aws_cloud_account_v1.graphql b/pkg/polaris/graphql/aws/queries/update_aws_cloud_account_v1.graphql
@@ -0,0 +1,5 @@
+mutation RubrikPolarisSDKRequest($action: CloudAccountActionEnum!, $cloudAccountId: UUID!, $awsRegions: [AwsCloudAccountRegionEnum!]!, $feature: CloudAccountFeature!) {
+    updateAwsCloudAccount(input: {action: $action, cloudAccountId: $cloudAccountId, awsRegions: $awsRegions, feature: $feature}) {
+        message
+    }
+}