ソースを参照

pass along arn

Justin Rhee 3 年 前
コミット
473d622765

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

@@ -18,7 +18,7 @@ import DocsHelper from "./DocsHelper";
 
 type Props = {
   goBack: () => void;
-  proceed: () => void;
+  proceed: (id: string) => void;
 };
 
 const CloudFormationForm: React.FC<Props> = ({
@@ -52,7 +52,7 @@ const CloudFormationForm: React.FC<Props> = ({
     //     setCreateStatus("Error creating credentials");
     //   });
       setRoleStatus("successful");
-      proceed();
+      proceed(targetARN);
   };
 
   const directToCloudFormation = () => {

+ 2 - 2
dashboard/src/components/ProvisionerFlow.tsx

@@ -135,8 +135,8 @@ const ProvisionerFlow: React.FC<Props> = ({
     return (
       <CloudFormationForm 
         goBack={() => setCurrentStep("cloud")}
-        proceed={() => {
-          // setCredentialId(id);
+        proceed={(id) => {
+          setCredentialId(id);
           setCurrentStep("cluster");
         }}
       />

+ 3 - 1
dashboard/src/components/porter/Spacer.tsx

@@ -3,6 +3,7 @@ import styled from "styled-components";
 
 type Props = {
   height?: string;
+  width?: string;
   y?: number;
   x?: number;
   inline?: boolean;
@@ -10,6 +11,7 @@ type Props = {
 
 const Spacer: React.FC<Props> = ({
   height,
+  width,
   y,
   x,
   inline,
@@ -31,7 +33,7 @@ const Spacer: React.FC<Props> = ({
   return (
     <StyledSpacer
       height={height || getCalcHeight()}
-      width={inline && getCalcWidth()}
+      width={inline && (width || getCalcWidth())}
     />
   );
 };

+ 1 - 1
dashboard/src/main/auth/Login.tsx

@@ -226,7 +226,7 @@ const Login: React.FC<Props> = ({
           size={13}
           color="helper"
         >
-          Don't have an account? <Link to="/register">Sign up</Link>
+          Don't have an account?<Spacer width="5px" inline /><Link to="/register">Sign up</Link>
         </Text>
       </Wrapper>
     </StyledLogin>

+ 1 - 1
dashboard/src/main/auth/Register.tsx

@@ -292,7 +292,7 @@ const Register: React.FC<Props> = ({
           size={13}
           color="helper"
         >
-          Already have an account? <Link to="/login">Log in</Link>
+          Already have an account?<Spacer width="5px" inline /><Link to="/login">Log in</Link>
         </Text>
       </Wrapper>
     </StyledRegister>

+ 5 - 0
go.work.sum

@@ -1,15 +1,20 @@
 cloud.google.com/go/compute v1.12.1/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU=
 cloud.google.com/go/compute/metadata v0.2.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
 github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60=
+github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
 github.com/containerd/stargz-snapshotter v0.11.3 h1:D3PoF563XmOBdtfx2G6AkhbHueqwIVPBFn2mrsWLa3w=
+github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y=
 github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
 github.com/go-redis/redis v6.15.8+incompatible h1:BKZuG6mCnRj5AOaWJXoCgf6rqTYnYJLe4en2hxT7r9o=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0=
 github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A=
+github.com/mitchellh/osext v0.0.0-20151018003038-5e2d6d41470f h1:2+myh5ml7lgEU/51gbeLHfKGNfgEQQIWrlbdaOsidbQ=
 github.com/nats-io/nats.go v1.9.1 h1:ik3HbLhZ0YABLto7iX80pZLPw/6dx3T+++MZJwLnMrQ=
 github.com/nats-io/nkeys v0.1.0 h1:qMd4+pRHgdr1nAClu+2h/2a5F2TmKcCzjCDazVgRoX4=
 github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
+github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72 h1:qLC7fQah7D6K1B0ujays3HV9gkFtllcxhzImRR7ArPQ=
 github.com/tchap/go-patricia v2.2.6+incompatible h1:JvoDL7JSoIP2HDE8AbDH3zC8QBPxmzYe32HHy5yQ+Ck=
 golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/net v0.3.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=