Просмотр исходного кода

use aws arn as cred id when provisioning

Justin Rhee 3 лет назад
Родитель
Сommit
8284fee2fe

+ 0 - 16
dashboard/package-lock.json

@@ -49,7 +49,6 @@
         "lodash": "^4.17.21",
         "markdown-to-jsx": "^7.0.1",
         "qs": "^6.9.4",
-        "random-words": "^1.1.1",
         "react": "^16.13.1",
         "react-ace": "^9.1.3",
         "react-color": "^2.19.3",
@@ -94,7 +93,6 @@
         "@types/material-ui": "^0.21.8",
         "@types/node": "^12.12.62",
         "@types/qs": "^6.9.5",
-        "@types/random-words": "^1.1.0",
         "@types/react": "^16.14.14",
         "@types/react-color": "^3.0.6",
         "@types/react-datepicker": "^4.4.2",
@@ -2927,12 +2925,6 @@
       "integrity": "sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==",
       "dev": true
     },
-    "node_modules/@types/random-words": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@types/random-words/-/random-words-1.1.2.tgz",
-      "integrity": "sha512-gULpJ68bNovfBWPWNNhwJgd/GcKdfkPpXXQGgACQWffgy6LRiJB4+4s/IslhFJKQvb5wBlnlOwFJ6RawHU5z3A==",
-      "dev": true
-    },
     "node_modules/@types/range-parser": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz",
@@ -10357,14 +10349,6 @@
       "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
       "dev": true
     },
-    "node_modules/random-words": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/random-words/-/random-words-1.1.1.tgz",
-      "integrity": "sha512-Rdk5EoQePyt9Tz3RjeMELi2BSaCI+jDiOkBr4U+3fyBRiiW3qqEuaegGAUMOZ4yGWlQscFQGqQpdic3mAbNkrw==",
-      "dependencies": {
-        "mocha": "^7.1.1"
-      }
-    },
     "node_modules/randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",

+ 0 - 2
dashboard/package.json

@@ -44,7 +44,6 @@
     "lodash": "^4.17.21",
     "markdown-to-jsx": "^7.0.1",
     "qs": "^6.9.4",
-    "random-words": "^1.1.1",
     "react": "^16.13.1",
     "react-ace": "^9.1.3",
     "react-color": "^2.19.3",
@@ -95,7 +94,6 @@
     "@types/material-ui": "^0.21.8",
     "@types/node": "^12.12.62",
     "@types/qs": "^6.9.5",
-    "@types/random-words": "^1.1.0",
     "@types/react": "^16.14.14",
     "@types/react-color": "^3.0.6",
     "@types/react-datepicker": "^4.4.2",

+ 3 - 2
dashboard/src/components/CredentialsForm.tsx

@@ -37,7 +37,7 @@ const CredentialsForm: React.FC<Props> = ({
   const [isLoading, setIsLoading] = useState(true);
   const [awsAccessKeyID, setAWSAccessKeyID] = useState("");
   const [awsSecretAccessKey, setAWSSecretAccessKey] = useState("");
-  const [selectedCredentials, setSelectedCredentials] = useState<AWSCredential>(null);
+  const [selectedCredentials, setSelectedCredentials] = useState(null);
   const [showCreateForm, setShowCreateForm] = useState(false);
   const [createStatus, setCreateStatus] = useState("");
 
@@ -51,6 +51,7 @@ const CredentialsForm: React.FC<Props> = ({
         }
       )
       .then(({ data }) => {
+        console.log("credentials", data);
         if (!Array.isArray(data)) {
           setAWSCredentials([]);
         } else {
@@ -128,7 +129,7 @@ const CredentialsForm: React.FC<Props> = ({
           <Br height="34px" />
           <SaveButton
             disabled={!selectedCredentials && true}
-            onClick={() => proceed(selectedCredentials.id)}
+            onClick={() => proceed(selectedCredentials.aws_arn)}
             clearPosition
             text="Continue"
           />

+ 2 - 2
dashboard/src/main/home/launch/launch-flow/LaunchFlow.tsx

@@ -1,7 +1,7 @@
 import React, { useContext, useState } from "react";
 import styled from "styled-components";
 import _ from "lodash";
-import randomWords from "random-words";
+import { generateSlug } from "random-word-slugs";
 import { RouteComponentProps, withRouter } from "react-router";
 
 import api from "shared/api";
@@ -66,7 +66,7 @@ const LaunchFlow: React.FC<PropsType> = (props) => {
   const [buildConfig, setBuildConfig] = useState();
 
   const generateRandomName = () => {
-    const randomTemplateName = randomWords({ exactly: 3, join: "-" });
+    const randomTemplateName = generateSlug();
     return randomTemplateName;
   };
 

+ 1 - 1
dashboard/src/shared/error_handling/logger.ts

@@ -33,7 +33,7 @@ function buildLogger(scope: string = "global") {
       if (typeof currentSeverity === "string") {
         acc[currentSeverity] = logFunctionBuilder(
           scope,
-          Sentry.Severity.fromString(currentSeverity)
+          Sentry.Severity.Info
         );
       }