fix ts

coder · f0ssel · Oct 21, 2022 · Oct 13, 2022 · Oct 14, 2022 · Oct 17, 2022
commit 63587f622c76fc05a3f9d57439733bc5a459ea86
diff --git a/site/src/AppRouter.tsx b/site/src/AppRouter.tsx
@@ -256,7 +256,7 @@ export const AppRouter: FC = () => {
             element={
               <AuthAndFrame>
                 <RequirePermission
-                  isFeatureVisible={Boolean(permissions?.viewDeploymentFlags)}
+                  isFeatureVisible={Boolean(permissions?.viewDeploymentConfig)}
                 >
                   <DeploySettingsLayout>
                     <GeneralSettingsPage />
@@ -270,7 +270,7 @@ export const AppRouter: FC = () => {
             element={
               <AuthAndFrame>
                 <RequirePermission
-                  isFeatureVisible={Boolean(permissions?.viewDeploymentFlags)}
+                  isFeatureVisible={Boolean(permissions?.viewDeploymentConfig)}
                 >
                   <DeploySettingsLayout>
                     <SecuritySettingsPage />
@@ -284,7 +284,7 @@ export const AppRouter: FC = () => {
             element={
               <AuthAndFrame>
                 <RequirePermission
-                  isFeatureVisible={Boolean(permissions?.viewDeploymentFlags)}
+                  isFeatureVisible={Boolean(permissions?.viewDeploymentConfig)}
                 >
                   <DeploySettingsLayout>
                     <NetworkSettingsPage />
@@ -298,7 +298,7 @@ export const AppRouter: FC = () => {
             element={
               <AuthAndFrame>
                 <RequirePermission
-                  isFeatureVisible={Boolean(permissions?.viewDeploymentFlags)}
+                  isFeatureVisible={Boolean(permissions?.viewDeploymentConfig)}
                 >
                   <DeploySettingsLayout>
                     <AuthSettingsPage />

diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -667,9 +667,9 @@ export const getAgentListeningPorts = async (
   return response.data
 }
 
-export const getDeploymentFlags =
-  async (): Promise<TypesGen.DeploymentFlags> => {
-    const response = await axios.get(`/api/v2/flags/deployment`)
+export const getDeploymentConfig =
+  async (): Promise<TypesGen.DeploymentConfig> => {
+    const response = await axios.get(`/api/v2/config/deployment`)
     return response.data
   }
 

diff --git a/site/src/components/DeploySettingsLayout/DeploySettingsLayout.tsx b/site/src/components/DeploySettingsLayout/DeploySettingsLayout.tsx
@@ -11,9 +11,9 @@ import React, {
 import { useActor } from "@xstate/react"
 import { XServiceContext } from "xServices/StateContext"
 import { Loader } from "components/Loader/Loader"
-import { DeploymentFlags } from "api/typesGenerated"
+import { DeploymentConfig } from "api/typesGenerated"
 
-type DeploySettingsContextValue = { deploymentFlags: DeploymentFlags }
+type DeploySettingsContextValue = { deploymentConfig: DeploymentConfig }
 
 const DeploySettingsContext = createContext<
   DeploySettingsContextValue | undefined
@@ -33,9 +33,9 @@ export const DeploySettingsLayout: React.FC<PropsWithChildren> = ({
   children,
 }) => {
   const xServices = useContext(XServiceContext)
-  const [state, send] = useActor(xServices.deploymentFlagsXService)
+  const [state, send] = useActor(xServices.deploymentConfigXService)
   const styles = useStyles()
-  const { deploymentFlags } = state.context
+  const { deploymentConfig } = state.context
 
   useEffect(() => {
     if (state.matches("idle")) {
@@ -48,8 +48,8 @@ export const DeploySettingsLayout: React.FC<PropsWithChildren> = ({
       <Stack className={styles.wrapper} direction="row" spacing={5}>
         <Sidebar />
         <main className={styles.content}>
-          {deploymentFlags ? (
-            <DeploySettingsContext.Provider value={{ deploymentFlags }}>
+          {deploymentConfig ? (
+            <DeploySettingsContext.Provider value={{ deploymentConfig: deploymentConfig }}>
               {children}
             </DeploySettingsContext.Provider>
           ) : (

diff --git a/site/src/components/DeploySettingsLayout/OptionsTable.tsx b/site/src/components/DeploySettingsLayout/OptionsTable.tsx
@@ -5,15 +5,15 @@ import TableCell from "@material-ui/core/TableCell"
 import TableContainer from "@material-ui/core/TableContainer"
 import TableHead from "@material-ui/core/TableHead"
 import TableRow from "@material-ui/core/TableRow"
-import { DeploymentFlags } from "api/typesGenerated"
+import { DeploymentConfig } from "api/typesGenerated"
 import {
   OptionDescription,
   OptionName,
   OptionValue,
 } from "components/DeploySettingsLayout/Option"
 import React from "react"
 
-const OptionsTable: React.FC<{ options: Partial<DeploymentFlags> }> = ({
+const OptionsTable: React.FC<{ options: Partial<DeploymentConfig> }> = ({
   options,
 }) => {
   const styles = useStyles()

diff --git a/site/src/components/Navbar/Navbar.tsx b/site/src/components/Navbar/Navbar.tsx
@@ -22,7 +22,7 @@ export const Navbar: React.FC = () => {
     featureVisibility[FeatureNames.AuditLog] &&
     Boolean(permissions?.viewAuditLog)
   const canViewDeployment =
-    experimental && Boolean(permissions?.viewDeploymentFlags)
+    experimental && Boolean(permissions?.viewDeploymentConfig)
   const onSignOut = () => authSend("SIGN_OUT")
 
   return (

diff --git a/site/src/pages/DeploySettingsPage/AuthSettingsPage.tsx b/site/src/pages/DeploySettingsPage/AuthSettingsPage.tsx
@@ -12,7 +12,7 @@ import { Helmet } from "react-helmet-async"
 import { pageTitle } from "util/page"
 
 const AuthSettingsPage: React.FC = () => {
-  const { deploymentFlags } = useDeploySettings()
+  const { deploymentConfig: deploymentConfig } = useDeploySettings()
 
   return (
     <>
@@ -32,7 +32,7 @@ const AuthSettingsPage: React.FC = () => {
           />
 
           <Badges>
-            {deploymentFlags.oidc_client_id.value ? (
+            {deploymentConfig.oidc_client_id.value ? (
               <EnabledBadge />
             ) : (
               <DisabledBadge />
@@ -41,12 +41,12 @@ const AuthSettingsPage: React.FC = () => {
 
           <OptionsTable
             options={{
-              oidc_client_id: deploymentFlags.oidc_client_id,
-              oidc_client_secret: deploymentFlags.oidc_client_secret,
-              oidc_allow_signups: deploymentFlags.oidc_allow_signups,
-              oidc_email_domain: deploymentFlags.oidc_email_domain,
-              oidc_issuer_url: deploymentFlags.oidc_issuer_url,
-              oidc_scopes: deploymentFlags.oidc_scopes,
+              oidc_client_id: deploymentConfig.oidc_client_id,
+              oidc_client_secret: deploymentConfig.oidc_client_secret,
+              oidc_allow_signups: deploymentConfig.oidc_allow_signups,
+              oidc_email_domain: deploymentConfig.oidc_email_domain,
+              oidc_issuer_url: deploymentConfig.oidc_issuer_url,
+              oidc_scopes: deploymentConfig.oidc_scopes,
             }}
           />
         </div>
@@ -60,7 +60,7 @@ const AuthSettingsPage: React.FC = () => {
           />
 
           <Badges>
-            {deploymentFlags.oauth2_github_client_id.value ? (
+            {deploymentConfig.oauth2_github_client_id.value ? (
               <EnabledBadge />
             ) : (
               <DisabledBadge />
@@ -69,17 +69,17 @@ const AuthSettingsPage: React.FC = () => {
 
           <OptionsTable
             options={{
-              oauth2_github_client_id: deploymentFlags.oauth2_github_client_id,
+              oauth2_github_client_id: deploymentConfig.oauth2_github_client_id,
               oauth2_github_client_secret:
-                deploymentFlags.oauth2_github_client_secret,
+                deploymentConfig.oauth2_github_client_secret,
               oauth2_github_allow_signups:
-                deploymentFlags.oauth2_github_allow_signups,
+                deploymentConfig.oauth2_github_allow_signups,
               oauth2_github_allowed_organizations:
-                deploymentFlags.oauth2_github_allowed_organizations,
+                deploymentConfig.oauth2_github_allowed_organizations,
               oauth2_github_allowed_teams:
-                deploymentFlags.oauth2_github_allowed_teams,
+                deploymentConfig.oauth2_github_allowed_teams,
               oauth2_github_enterprise_base_url:
-                deploymentFlags.oauth2_github_enterprise_base_url,
+                deploymentConfig.oauth2_github_enterprise_base_url,
             }}
           />
         </div>

diff --git a/site/src/pages/DeploySettingsPage/GeneralSettingsPage.tsx b/site/src/pages/DeploySettingsPage/GeneralSettingsPage.tsx
@@ -6,7 +6,7 @@ import { Helmet } from "react-helmet-async"
 import { pageTitle } from "util/page"
 
 const GeneralSettingsPage: React.FC = () => {
-  const { deploymentFlags } = useDeploySettings()
+  const { deploymentConfig: deploymentConfig } = useDeploySettings()
 
   return (
     <>
@@ -22,9 +22,9 @@ const GeneralSettingsPage: React.FC = () => {
 
       <OptionsTable
         options={{
-          access_url: deploymentFlags.access_url,
-          address: deploymentFlags.address,
-          wildcard_access_url: deploymentFlags.wildcard_access_url,
+          access_url: deploymentConfig.access_url,
+          address: deploymentConfig.address,
+          wildcard_access_url: deploymentConfig.wildcard_access_url,
         }}
       />
     </>

diff --git a/site/src/pages/DeploySettingsPage/NetworkSettingsPage.tsx b/site/src/pages/DeploySettingsPage/NetworkSettingsPage.tsx
@@ -6,7 +6,7 @@ import { Helmet } from "react-helmet-async"
 import { pageTitle } from "util/page"
 
 const NetworkSettingsPage: React.FC = () => {
-  const { deploymentFlags } = useDeploySettings()
+  const { deploymentConfig: deploymentConfig } = useDeploySettings()
 
   return (
     <>
@@ -22,10 +22,10 @@ const NetworkSettingsPage: React.FC = () => {
 
       <OptionsTable
         options={{
-          derp_server_enabled: deploymentFlags.derp_server_enabled,
-          derp_server_region_name: deploymentFlags.derp_server_region_name,
-          derp_server_stun_address: deploymentFlags.derp_server_stun_address,
-          derp_config_url: deploymentFlags.derp_config_url,
+          derp_server_enabled: deploymentConfig.derp_server_enabled,
+          derp_server_region_name: deploymentConfig.derp_server_region_name,
+          derp_server_stun_address: deploymentConfig.derp_server_stun_address,
+          derp_config_url: deploymentConfig.derp_config_url,
         }}
       />
     </>

diff --git a/site/src/pages/DeploySettingsPage/SecuritySettingsPage.tsx b/site/src/pages/DeploySettingsPage/SecuritySettingsPage.tsx
@@ -16,7 +16,7 @@ import { pageTitle } from "util/page"
 import { XServiceContext } from "xServices/StateContext"
 
 const SecuritySettingsPage: React.FC = () => {
-  const { deploymentFlags } = useDeploySettings()
+  const { deploymentConfig: deploymentConfig } = useDeploySettings()
   const xServices = useContext(XServiceContext)
   const [entitlementsState] = useActor(xServices.entitlementsXService)
 
@@ -34,8 +34,8 @@ const SecuritySettingsPage: React.FC = () => {
 
           <OptionsTable
             options={{
-              ssh_keygen_algorithm: deploymentFlags.ssh_keygen_algorithm,
-              secure_auth_cookie: deploymentFlags.secure_auth_cookie,
+              ssh_keygen_algorithm: deploymentConfig.ssh_keygen_algorithm,
+              secure_auth_cookie: deploymentConfig.secure_auth_cookie,
             }}
           />
         </div>
@@ -89,10 +89,10 @@ const SecuritySettingsPage: React.FC = () => {
 
           <OptionsTable
             options={{
-              tls_enable: deploymentFlags.tls_enable,
-              tls_cert_files: deploymentFlags.tls_cert_files,
-              tls_key_files: deploymentFlags.tls_key_files,
-              tls_min_version: deploymentFlags.tls_min_version,
+              tls_enable: deploymentConfig.tls_enable,
+              tls_cert_files: deploymentConfig.tls_cert_files,
+              tls_key_files: deploymentConfig.tls_key_files,
+              tls_min_version: deploymentConfig.tls_min_version,
             }}
           />
         </div>

diff --git a/site/src/xServices/StateContext.tsx b/site/src/xServices/StateContext.tsx
@@ -3,7 +3,7 @@ import { createContext, FC, ReactNode } from "react"
 import { ActorRefFrom } from "xstate"
 import { authMachine } from "./auth/authXService"
 import { buildInfoMachine } from "./buildInfo/buildInfoXService"
-import { deploymentFlagsMachine } from "./deploymentFlags/deploymentFlagsMachine"
+import { deploymentConfigMachine } from "./deploymentConfig/deploymentConfigMachine"
 import { entitlementsMachine } from "./entitlements/entitlementsXService"
 import { siteRolesMachine } from "./roles/siteRolesXService"
 
@@ -13,7 +13,7 @@ interface XServiceContextType {
   entitlementsXService: ActorRefFrom<typeof entitlementsMachine>
   siteRolesXService: ActorRefFrom<typeof siteRolesMachine>
   // Since the info here is used by multiple deployment settings page and we don't want to refetch them every time
-  deploymentFlagsXService: ActorRefFrom<typeof deploymentFlagsMachine>
+  deploymentConfigXService: ActorRefFrom<typeof deploymentConfigMachine>
 }
 
 /**
@@ -34,7 +34,7 @@ export const XServiceProvider: FC<{ children: ReactNode }> = ({ children }) => {
         buildInfoXService: useInterpret(buildInfoMachine),
         entitlementsXService: useInterpret(entitlementsMachine),
         siteRolesXService: useInterpret(siteRolesMachine),
-        deploymentFlagsXService: useInterpret(deploymentFlagsMachine),
+        deploymentConfigXService: useInterpret(deploymentConfigMachine),
       }}
     >
       {children}

diff --git a/site/src/xServices/auth/authXService.ts b/site/src/xServices/auth/authXService.ts
@@ -16,7 +16,7 @@ export const checks = {
   createTemplates: "createTemplates",
   deleteTemplates: "deleteTemplates",
   viewAuditLog: "viewAuditLog",
-  viewDeploymentFlags: "viewDeploymentFlags",
+  viewDeploymentConfig: "viewDeploymentConfig",
   createGroup: "createGroup",
 } as const
 
@@ -57,7 +57,7 @@ export const permissionsToCheck = {
     },
     action: "read",
   },
-  [checks.viewDeploymentFlags]: {
+  [checks.viewDeploymentConfig]: {
     object: {
       resource_type: "deployment_flags",
     },

diff --git a/site/src/xServices/deploymentFlags/deploymentFlagsMachine.ts b/site/src/xServices/deploymentFlags/deploymentFlagsMachine.ts