EVG-19946: Support Docker on provider settings page (evergreen-ci#2017)

khelif96 · Sep 18, 2023 · 372a1e0 · 372a1e0
1 parent 74015b7
commit 372a1e0
Show file tree

Hide file tree

Showing 18 changed files with 534 additions and 188 deletions.
diff --git a/cypress/integration/distroSettings/navigation.ts b/cypress/integration/distroSettings/navigation.ts
@@ -33,11 +33,11 @@ describe("using the distro dropdown", () => {
 
     describe("modifying the distro provider", () => {
       beforeEach(() => {
-        cy.visit("/distro/localhost/settings/provider");
+        cy.visit("/distro/ubuntu1604-container-test/settings/provider");
       });
 
       it("warns when navigating to another distro settings tab after the provider has changed and allows save", () => {
-        cy.selectLGOption("Provider", "Docker");
+        cy.selectLGOption("Provider", "Static");
         cy.dataCy("save-settings-button").should(
           "not.have.attr",
           "aria-disabled",

diff --git a/cypress/integration/distroSettings/provider_section.ts b/cypress/integration/distroSettings/provider_section.ts
@@ -1,38 +1,86 @@
 import { save } from "./utils";
 
 describe("provider section", () => {
-  beforeEach(() => {
-    cy.visit("/distro/localhost/settings/provider");
-  });
+  describe("static", () => {
+    beforeEach(() => {
+      cy.visit("/distro/localhost/settings/provider");
+    });
 
-  it("successfully updates static provider fields", () => {
-    cy.dataCy("provider-select").contains("Static IP/VM");
+    it("successfully updates static provider fields", () => {
+      cy.dataCy("provider-select").contains("Static IP/VM");
 
-    // Correct fields are displayed
-    cy.dataCy("provider-settings").within(() => {
-      cy.get("button").should("have.length", 1);
-      cy.get("textarea").should("have.length", 1);
-      cy.get("input[type=checkbox]").should("have.length", 1);
-      cy.get("input[type=text]").should("have.length", 0);
-    });
+      // Correct section is displayed.
+      cy.dataCy("static-provider-settings").should("exist");
 
-    cy.getInputByLabel("User Data").type("my user data");
-    cy.getInputByLabel("Merge with existing user data").check({
-      force: true,
+      // Change field values.
+      cy.getInputByLabel("User Data").type("my user data");
+      cy.getInputByLabel("Merge with existing user data").check({
+        force: true,
+      });
+      cy.contains("button", "Add security group").click();
+      cy.getInputByLabel("Security Group ID").type("group-1234");
+      save();
+      cy.validateToast("success");
+
+      // Revert fields to original values.
+      cy.getInputByLabel("User Data").clear();
+      cy.getInputByLabel("Merge with existing user data").uncheck({
+        force: true,
+      });
+      cy.dataCy("delete-item-button").click();
+      save();
+      cy.validateToast("success");
     });
-    cy.contains("button", "Add security group").click();
-    cy.getInputByLabel("Security Group ID").type("group-1234");
+  });
 
-    save();
-    cy.validateToast("success");
+  describe("docker", () => {
+    beforeEach(() => {
+      cy.visit("/distro/ubuntu1604-container-test/settings/provider");
+    });
 
-    cy.getInputByLabel("User Data").clear();
-    cy.getInputByLabel("Merge with existing user data").uncheck({
-      force: true,
+    it("shows pool mapping information based on container pool id", () => {
+      cy.getInputByLabel("Container Pool ID").should(
+        "contain.text",
+        "test-pool-1"
+      );
+      cy.getInputByLabel("Pool Mapping Information")
+        .should("have.attr", "placeholder")
+        .and("match", /test-pool-1/);
+      cy.selectLGOption("Container Pool ID", "test-pool-2");
+      cy.getInputByLabel("Pool Mapping Information")
+        .should("have.attr", "placeholder")
+        .and("match", /test-pool-2/);
     });
-    cy.dataCy("delete-item-button").click();
 
-    save();
-    cy.validateToast("success");
+    it("successfully updates docker provider fields", () => {
+      cy.dataCy("provider-select").contains("Docker");
+
+      // Correct section is displayed.
+      cy.dataCy("docker-provider-settings").should("exist");
+
+      // Change field values.
+      cy.selectLGOption("Image Build Method", "Pull");
+      cy.selectLGOption("Container Pool ID", "test-pool-2");
+      cy.getInputByLabel("Username for Registries").type("username");
+      cy.getInputByLabel("Password for Registries").type("password");
+      cy.getInputByLabel("User Data").type("my user data");
+      cy.getInputByLabel("Merge with existing user data").check({
+        force: true,
+      });
+      save();
+      cy.validateToast("success");
+
+      // Revert fields to original values.
+      cy.selectLGOption("Image Build Method", "Import");
+      cy.selectLGOption("Container Pool ID", "test-pool-1");
+      cy.getInputByLabel("Username for Registries").clear();
+      cy.getInputByLabel("Password for Registries").clear();
+      cy.getInputByLabel("User Data").clear();
+      cy.getInputByLabel("Merge with existing user data").uncheck({
+        force: true,
+      });
+      save();
+      cy.validateToast("success");
+    });
   });
 });
diff --git a/src/components/Header/Navbar.tsx b/src/components/Header/Navbar.tsx
@@ -13,7 +13,7 @@ import { getCommitsRoute, getUserPatchesRoute, routes } from "constants/routes";
 import { size } from "constants/tokens";
 import { useAuthStateContext } from "context/auth";
 import { UserQuery, SpruceConfigQuery } from "gql/generated/types";
-import { GET_USER, GET_SPRUCE_CONFIG } from "gql/queries";
+import { GET_USER, SPRUCE_CONFIG } from "gql/queries";
 import { useLegacyUIURL } from "hooks";
 import { AuxiliaryDropdown } from "./AuxiliaryDropdown";
 import { UserDropdown } from "./UserDropdown";
@@ -43,7 +43,7 @@ export const Navbar: React.FC = () => {
 
   const currProject = projectFromUrl ?? Cookies.get(CURRENT_PROJECT);
 
-  const { data: configData } = useQuery<SpruceConfigQuery>(GET_SPRUCE_CONFIG, {
+  const { data: configData } = useQuery<SpruceConfigQuery>(SPRUCE_CONFIG, {
     skip: currProject !== undefined,
   });
 

diff --git a/src/components/SpruceForm/Widgets/LeafyGreenWidgets.tsx b/src/components/SpruceForm/Widgets/LeafyGreenWidgets.tsx
@@ -333,6 +333,7 @@ export const LeafyGreenTextArea: React.FC<SpruceWidgetProps> = ({
   label,
   onChange,
   options,
+  placeholder,
   rawErrors,
   readonly,
   value,
@@ -362,6 +363,7 @@ export const LeafyGreenTextArea: React.FC<SpruceWidgetProps> = ({
     <ElementWrapper css={elementWrapperCSS}>
       <TextArea
         ref={el}
+        placeholder={placeholder || undefined}
         data-cy={dataCy}
         label={label}
         disabled={disabled || readonly}

diff --git a/src/constants/fieldMaps.ts b/src/constants/fieldMaps.ts
@@ -167,13 +167,6 @@ export const timeZones = [
   },
 ];
 
-export const awsRegions = [
-  {
-    str: "US-East-1",
-    value: "us-east-1",
-  },
-];
-
 const listOfDateFormatStrings = [
   "MM-dd-yyyy",
   "dd-MM-yyyy",

diff --git a/src/gql/generated/types.ts b/src/gql/generated/types.ts
@@ -7815,42 +7815,6 @@ export type RepoSettingsQuery = {
   };
 };
 
-export type SpruceConfigQueryVariables = Exact<{ [key: string]: never }>;
-
-export type SpruceConfigQuery = {
-  __typename?: "Query";
-  spruceConfig?: {
-    __typename?: "SpruceConfig";
-    banner?: string | null;
-    bannerTheme?: string | null;
-    jira?: { __typename?: "JiraConfig"; host?: string | null } | null;
-    keys: Array<{ __typename?: "SSHKey"; location: string; name: string }>;
-    providers?: {
-      __typename?: "CloudProviderConfig";
-      aws?: {
-        __typename?: "AWSConfig";
-        maxVolumeSizePerUser?: number | null;
-        pod?: {
-          __typename?: "AWSPodConfig";
-          ecs?: {
-            __typename?: "ECSConfig";
-            maxCPU: number;
-            maxMemoryMb: number;
-          } | null;
-        } | null;
-      } | null;
-    } | null;
-    slack?: { __typename?: "SlackConfig"; name?: string | null } | null;
-    spawnHost: {
-      __typename?: "SpawnHostConfig";
-      spawnHostsPerUser: number;
-      unexpirableHostsPerUser: number;
-      unexpirableVolumesPerUser: number;
-    };
-    ui?: { __typename?: "UIConfig"; defaultProject: string } | null;
-  } | null;
-};
-
 export type SystemLogsQueryVariables = Exact<{
   id: Scalars["String"]["input"];
   execution?: InputMaybe<Scalars["Int"]["input"]>;
@@ -8678,6 +8642,52 @@ export type SpawnTaskQuery = {
   } | null;
 };
 
+export type SpruceConfigQueryVariables = Exact<{ [key: string]: never }>;
+
+export type SpruceConfigQuery = {
+  __typename?: "Query";
+  spruceConfig?: {
+    __typename?: "SpruceConfig";
+    banner?: string | null;
+    bannerTheme?: string | null;
+    containerPools?: {
+      __typename?: "ContainerPoolsConfig";
+      pools: Array<{
+        __typename?: "ContainerPool";
+        distro: string;
+        id: string;
+        maxContainers: number;
+        port: number;
+      }>;
+    } | null;
+    jira?: { __typename?: "JiraConfig"; host?: string | null } | null;
+    keys: Array<{ __typename?: "SSHKey"; location: string; name: string }>;
+    providers?: {
+      __typename?: "CloudProviderConfig";
+      aws?: {
+        __typename?: "AWSConfig";
+        maxVolumeSizePerUser?: number | null;
+        pod?: {
+          __typename?: "AWSPodConfig";
+          ecs?: {
+            __typename?: "ECSConfig";
+            maxCPU: number;
+            maxMemoryMb: number;
+          } | null;
+        } | null;
+      } | null;
+    } | null;
+    slack?: { __typename?: "SlackConfig"; name?: string | null } | null;
+    spawnHost: {
+      __typename?: "SpawnHostConfig";
+      spawnHostsPerUser: number;
+      unexpirableHostsPerUser: number;
+      unexpirableVolumesPerUser: number;
+    };
+    ui?: { __typename?: "UIConfig"; defaultProject: string } | null;
+  } | null;
+};
+
 export type SubnetAvailabilityZonesQueryVariables = Exact<{
   [key: string]: never;
 }>;

diff --git a/src/gql/mocks/getSpruceConfig.ts b/src/gql/mocks/getSpruceConfig.ts
@@ -2,15 +2,15 @@ import {
   SpruceConfigQuery,
   SpruceConfigQueryVariables,
 } from "gql/generated/types";
-import { GET_SPRUCE_CONFIG } from "gql/queries";
+import { SPRUCE_CONFIG } from "gql/queries";
 import { ApolloMock } from "types/gql";
 
 export const getSpruceConfigMock: ApolloMock<
   SpruceConfigQuery,
   SpruceConfigQueryVariables
 > = {
   request: {
-    query: GET_SPRUCE_CONFIG,
+    query: SPRUCE_CONFIG,
     variables: {},
   },
   result: {
@@ -22,6 +22,16 @@ export const getSpruceConfigMock: ApolloMock<
           defaultProject: "evergreen",
           __typename: "UIConfig",
         },
+        containerPools: {
+          pools: [
+            {
+              distro: "localhost",
+              id: "test-pool",
+              maxContainers: 5,
+              port: 1234,
+            },
+          ],
+        },
         keys: [
           {
             name: "fake_key",

diff --git a/src/gql/queries/index.ts b/src/gql/queries/index.ts
@@ -47,7 +47,6 @@ import GET_PROJECTS from "./get-projects.graphql";
 import GET_MY_PUBLIC_KEYS from "./get-public-keys.graphql";
 import GET_REPO_EVENT_LOGS from "./get-repo-event-logs.graphql";
 import GET_REPO_SETTINGS from "./get-repo-settings.graphql";
-import GET_SPRUCE_CONFIG from "./get-spruce-config.graphql";
 import GET_SYSTEM_LOGS from "./get-system-logs.graphql";
 import GET_TASK_ALL_EXECUTIONS from "./get-task-all-executions.graphql";
 import GET_TASK_EVENT_LOGS from "./get-task-event-logs.graphql";
@@ -71,6 +70,7 @@ import PROJECT_HEALTH_VIEW from "./project-health-view.graphql";
 import GET_PROJECT_PATCHES from "./project-patches.graphql";
 import GET_SPAWN_EXPIRATION_INFO from "./spawn-expiration.graphql";
 import GET_SPAWN_TASK from "./spawn-task.graphql";
+import SPRUCE_CONFIG from "./spruce-config.graphql";
 import GET_SUBNET_AVAILABILITY_ZONES from "./subnet-availability-zones.graphql";
 import TASK_QUEUE_DISTROS from "./task-queue-distros.graphql";
 import USER_DISTRO_SETTINGS_PERMISSIONS from "./user-distro-settings-permissions.graphql";
@@ -131,7 +131,7 @@ export {
   GET_REPO_SETTINGS,
   GET_SPAWN_EXPIRATION_INFO,
   GET_SPAWN_TASK,
-  GET_SPRUCE_CONFIG,
+  SPRUCE_CONFIG,
   GET_SUBNET_AVAILABILITY_ZONES,
   GET_SYSTEM_LOGS,
   GET_TASK_ALL_EXECUTIONS,

diff --git a/src/gql/queries/get-spruce-config.graphql → src/gql/queries/spruce-config.graphql b/src/gql/queries/get-spruce-config.graphql → src/gql/queries/spruce-config.graphql
@@ -2,6 +2,14 @@ query SpruceConfig {
   spruceConfig {
     banner
     bannerTheme
+    containerPools {
+      pools {
+        distro
+        id
+        maxContainers
+        port
+      }
+    }
     jira {
       host
     }

diff --git a/src/hooks/useSpruceConfig.ts b/src/hooks/useSpruceConfig.ts
@@ -3,11 +3,11 @@ import {
   SpruceConfigQuery,
   SpruceConfigQueryVariables,
 } from "gql/generated/types";
-import { GET_SPRUCE_CONFIG } from "gql/queries";
+import { SPRUCE_CONFIG } from "gql/queries";
 
 export const useSpruceConfig = () => {
   const { data } = useQuery<SpruceConfigQuery, SpruceConfigQueryVariables>(
-    GET_SPRUCE_CONFIG
+    SPRUCE_CONFIG
   );
 
   const { spruceConfig } = data || {};

diff --git a/src/pages/commits/index.tsx b/src/pages/commits/index.tsx
@@ -29,7 +29,7 @@ import {
   MainlineCommitsQueryVariables,
   ProjectHealthView,
 } from "gql/generated/types";
-import { GET_MAINLINE_COMMITS, GET_SPRUCE_CONFIG } from "gql/queries";
+import { GET_MAINLINE_COMMITS, SPRUCE_CONFIG } from "gql/queries";
 import {
   usePageTitle,
   usePolling,
@@ -77,7 +77,7 @@ const Commits = () => {
   const { data: spruceData } = useQuery<
     SpruceConfigQuery,
     SpruceConfigQueryVariables
-  >(GET_SPRUCE_CONFIG, {
+  >(SPRUCE_CONFIG, {
     skip: !!projectIdentifier || !!recentlySelectedProject,
   });