From 0e36f10cf5ad80b80ad266156e186e2a6655e9f9 Mon Sep 17 00:00:00 2001
From: bohandley <brendan.ohandley@gmail.com>
Date: Thu, 27 Jul 2023 15:14:00 -0400
Subject: [PATCH 1/2] update input width for experimental auth component

---
 src/ConnectionConfig.tsx | 24 ++++++++++++++----------
 src/types.ts             |  1 +
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/ConnectionConfig.tsx b/src/ConnectionConfig.tsx
index b11cbe5..c09edff 100644
--- a/src/ConnectionConfig.tsx
+++ b/src/ConnectionConfig.tsx
@@ -71,6 +71,10 @@ export const ConnectionConfig: FC<ConnectionConfigProps> = (props: ConnectionCon
     loadRegions().then((regions) => setRegions(regions.map(toOption)));
   }, [loadRegions]);
 
+  const inExperimentalAuthComponent = options.jsonData.inExperimentalAuthComponent;
+
+  const inputWidth = inExperimentalAuthComponent ? "width-20" : "width-30";
+
   return (
     <FieldSet label={skipHeader ? '' : 'Connection Details'} data-testid="connection-config">
       <InlineField
@@ -80,7 +84,7 @@ export const ConnectionConfig: FC<ConnectionConfigProps> = (props: ConnectionCon
       >
         <Select
           aria-label="Authentication Provider"
-          className="width-30"
+          className={inputWidth}
           value={currentProvider}
           options={awsAuthProviderOptions.filter((opt) => awsAllowedAuthProviders.includes(opt.value!))}
           defaultValue={options.jsonData.authType}
@@ -98,7 +102,7 @@ export const ConnectionConfig: FC<ConnectionConfigProps> = (props: ConnectionCon
         >
           <Input
             aria-label="Credentials Profile Name"
-            className="width-30"
+            className={inputWidth}
             placeholder="default"
             value={profile}
             onChange={onUpdateDatasourceJsonDataOption(props, 'profile')}
@@ -110,7 +114,7 @@ export const ConnectionConfig: FC<ConnectionConfigProps> = (props: ConnectionCon
         <>
           <InlineField label="Access Key ID" labelWidth={labelWidth}>
             {props.options.secureJsonFields?.accessKey ? (
-              <ButtonGroup className="width-30">
+              <ButtonGroup className={inputWidth}>
                 <Input disabled placeholder="Configured" />
                 <ToolbarButton
                   icon="edit"
@@ -122,7 +126,7 @@ export const ConnectionConfig: FC<ConnectionConfigProps> = (props: ConnectionCon
             ) : (
               <Input
                 aria-label="Access Key ID"
-                className="width-30"
+                className={inputWidth}
                 value={options.secureJsonData?.accessKey ?? ''}
                 onChange={onUpdateDatasourceSecureJsonDataOption(props, 'accessKey')}
               />
@@ -131,7 +135,7 @@ export const ConnectionConfig: FC<ConnectionConfigProps> = (props: ConnectionCon
 
           <InlineField label="Secret Access Key" labelWidth={labelWidth}>
             {props.options.secureJsonFields?.secretKey ? (
-              <ButtonGroup className="width-30">
+              <ButtonGroup className={inputWidth}>
                 <Input disabled placeholder="Configured" />
                 <ToolbarButton
                   icon="edit"
@@ -143,7 +147,7 @@ export const ConnectionConfig: FC<ConnectionConfigProps> = (props: ConnectionCon
             ) : (
               <Input
                 aria-label="Secret Access Key"
-                className="width-30"
+                className={inputWidth}
                 value={options.secureJsonData?.secretKey ?? ''}
                 onChange={onUpdateDatasourceSecureJsonDataOption(props, 'secretKey')}
               />
@@ -161,7 +165,7 @@ export const ConnectionConfig: FC<ConnectionConfigProps> = (props: ConnectionCon
           >
             <Input
               aria-label="Assume Role ARN"
-              className="width-30"
+              className={inputWidth}
               placeholder="arn:aws:iam:*"
               value={options.jsonData.assumeRoleArn || ''}
               onChange={onUpdateDatasourceJsonDataOption(props, 'assumeRoleArn')}
@@ -175,7 +179,7 @@ export const ConnectionConfig: FC<ConnectionConfigProps> = (props: ConnectionCon
             >
               <Input
                 aria-label="External ID"
-                className="width-30"
+                className={inputWidth}
                 placeholder="External ID"
                 value={options.jsonData.externalId || ''}
                 onChange={onUpdateDatasourceJsonDataOption(props, 'externalId')}
@@ -192,7 +196,7 @@ export const ConnectionConfig: FC<ConnectionConfigProps> = (props: ConnectionCon
         >
           <Input
             aria-label="Endpoint"
-            className="width-30"
+            className={inputWidth}
             placeholder={props.defaultEndpoint ?? 'https://{service}.{region}.amazonaws.com'}
             value={options.jsonData.endpoint || ''}
             onChange={onUpdateDatasourceJsonDataOption(props, 'endpoint')}
@@ -206,7 +210,7 @@ export const ConnectionConfig: FC<ConnectionConfigProps> = (props: ConnectionCon
       >
         <Select
           aria-label="Default Region"
-          className="width-30"
+          className={inputWidth}
           value={regions.find((region) => region.value === options.jsonData.defaultRegion)}
           options={regions}
           defaultValue={options.jsonData.defaultRegion}
diff --git a/src/types.ts b/src/types.ts
index 5c6d2f0..7697aac 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -19,6 +19,7 @@ export interface AwsAuthDataSourceJsonData extends DataSourceJsonData {
   profile?: string; // Credentials profile name, as specified in ~/.aws/credentials
   defaultRegion?: string; // region if it is not defined by your credentials file
   endpoint?: string;
+  inExperimentalAuthComponent?: boolean;
 }
 
 export interface AwsAuthDataSourceSecureJsonData {

From d349702c7e989276d25d5d750cf2ea7e73f3be49 Mon Sep 17 00:00:00 2001
From: bohandley <brendan.ohandley@gmail.com>
Date: Thu, 3 Aug 2023 16:56:04 -0400
Subject: [PATCH 2/2] pass flag as component prop instead of in jsondata

---
 src/ConnectionConfig.tsx      | 9 ++++++---
 src/SIGV4ConnectionConfig.tsx | 9 +++++++--
 src/types.ts                  | 1 -
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/ConnectionConfig.tsx b/src/ConnectionConfig.tsx
index c09edff..5381157 100644
--- a/src/ConnectionConfig.tsx
+++ b/src/ConnectionConfig.tsx
@@ -28,12 +28,17 @@ export interface ConnectionConfigProps<
   skipEndpoint?: boolean;
   children?: React.ReactNode;
   labelWidth?: number;
+  inExperimentalAuthComponent?: boolean;
 }
 
 export const ConnectionConfig: FC<ConnectionConfigProps> = (props: ConnectionConfigProps) => {
   const [regions, setRegions] = useState((props.standardRegions || standardRegions).map(toOption));
   const { loadRegions, onOptionsChange, skipHeader = false, skipEndpoint = false } = props;
-  const { labelWidth = DEFAULT_LABEL_WIDTH, options } = props;
+  const { 
+    labelWidth = DEFAULT_LABEL_WIDTH, 
+    options, 
+    inExperimentalAuthComponent 
+  } = props;
   let profile = options.jsonData.profile;
   if (profile === undefined) {
     profile = options.database;
@@ -71,8 +76,6 @@ export const ConnectionConfig: FC<ConnectionConfigProps> = (props: ConnectionCon
     loadRegions().then((regions) => setRegions(regions.map(toOption)));
   }, [loadRegions]);
 
-  const inExperimentalAuthComponent = options.jsonData.inExperimentalAuthComponent;
-
   const inputWidth = inExperimentalAuthComponent ? "width-20" : "width-30";
 
   return (
diff --git a/src/SIGV4ConnectionConfig.tsx b/src/SIGV4ConnectionConfig.tsx
index 283db0b..2e17088 100644
--- a/src/SIGV4ConnectionConfig.tsx
+++ b/src/SIGV4ConnectionConfig.tsx
@@ -4,8 +4,12 @@ import { ConnectionConfig, ConnectionConfigProps } from './ConnectionConfig';
 
 import { AwsAuthDataSourceSecureJsonData, AwsAuthDataSourceJsonData } from './types';
 
-export const SIGV4ConnectionConfig: React.FC<DataSourcePluginOptionsEditorProps<any, any>> = (
-  props: DataSourcePluginOptionsEditorProps<any, any>
+export interface SIGV4ConnectionConfigProps extends DataSourcePluginOptionsEditorProps<any, any> {
+  inExperimentalAuthComponent?: boolean;
+};
+
+export const SIGV4ConnectionConfig: React.FC<SIGV4ConnectionConfigProps> = (
+  props: SIGV4ConnectionConfigProps
 ) => {
   const { onOptionsChange, options } = props;
 
@@ -54,6 +58,7 @@ export const SIGV4ConnectionConfig: React.FC<DataSourcePluginOptionsEditorProps<
         secretKey: options.secureJsonData?.sigV4SecretKey,
       },
     },
+    inExperimentalAuthComponent: props.inExperimentalAuthComponent,
   };
 
   return (
diff --git a/src/types.ts b/src/types.ts
index 7697aac..5c6d2f0 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -19,7 +19,6 @@ export interface AwsAuthDataSourceJsonData extends DataSourceJsonData {
   profile?: string; // Credentials profile name, as specified in ~/.aws/credentials
   defaultRegion?: string; // region if it is not defined by your credentials file
   endpoint?: string;
-  inExperimentalAuthComponent?: boolean;
 }
 
 export interface AwsAuthDataSourceSecureJsonData {