Bladeren bron

variable trust arn (#2891)

* variable trust arn

* register redirect
sunguroku 3 jaren geleden
bovenliggende
commit
edad723544
2 gewijzigde bestanden met toevoegingen van 3 en 2 verwijderingen
  1. 2 1
      dashboard/src/components/CloudFormationForm.tsx
  2. 1 1
      ee/api/server/handlers/invite/accept.go

+ 2 - 1
dashboard/src/components/CloudFormationForm.tsx

@@ -76,9 +76,10 @@ const CloudFormationForm: React.FC<Props> = ({
 
   const directToCloudFormation = () => {
     let externalId = getExternalId();
+    let trustArn = process.env.TRUST_ARN ? process.env.TRUST_ARN : "arn:aws:iam::108458755588:role/CAPIManagement";
     window.open(
       `https://console.aws.amazon.com/cloudformation/home?
-      #/stacks/create/review?templateURL=https://porter-role.s3.us-east-2.amazonaws.com/cloudformation-policy.json&stackName=PorterRole&param_ExternalIdParameter=${externalId}`
+      #/stacks/create/review?templateURL=https://porter-role.s3.us-east-2.amazonaws.com/cloudformation-policy.json&stackName=PorterRole&param_ExternalIdParameter=${externalId}&param_TrustArnParameter=${trustArn}`
     )
   }
 

+ 1 - 1
ee/api/server/handlers/invite/accept.go

@@ -104,5 +104,5 @@ func (c *InviteAcceptHandler) ServeHTTP(w http.ResponseWriter, r *http.Request)
 		return
 	}
 
-	http.Redirect(w, r, "/dashboard", 302)
+	http.Redirect(w, r, fmt.Sprintf("/register?email=%s", invite.Email), 302)
 }