Prep work for creating one WIF configuration component (#29345)

* initial things without helper changes

* adjust test for clean up of secret-engine-helper

* remove added line thats better in next pr

* remove extra check

* 🧹

* replace return with continue within loops

ui/app/models/aws/lease-config.js

@@ -32,8 +32,15 @@ export default class AwsLeaseConfig extends Model {
   })
   lease;
 
+  configurableParams = ['lease', 'leaseMax'];
+
   get displayAttrs() {
-    const keys = ['lease', 'leaseMax'];
-    return expandAttributeMeta(this, keys);
+    // while identical to formFields, keeping the same pattern as other configurable secret engines for consistency
+    // and to easily filter out displayAttributes in the future if needed
+    return this.formFields;
+  }
+
+  get formFields() {
+    return expandAttributeMeta(this, this.configurableParams);
   }
 }

ui/app/models/aws/root-config.js

@@ -45,23 +45,33 @@ export default class AwsRootConfig extends Model {
   iamEndpoint;
   @attr('string', { label: 'STS endpoint' }) stsEndpoint;
   @attr('number', {
-    label: 'Maximum retries',
     subText: 'Number of max retries the client should use for recoverable errors. Default is -1.',
   })
   maxRetries;
 
+  configurableParams = [
+    'roleArn',
+    'identityTokenAudience',
+    'identityTokenTtl',
+    'accessKey',
+    'secretKey',
+    'region',
+    'iamEndpoint',
+    'stsEndpoint',
+    'maxRetries',
+  ];
+
+  get isWifPluginConfigured() {
+    return !!this.identityTokenAudience || !!this.identityTokenTtl || !!this.roleArn;
+  }
+
+  get isAccountPluginConfigured() {
+    return !!this.accessKey;
+  }
+
   get displayAttrs() {
-    const keys = [
-      'roleArn',
-      'identityTokenAudience',
-      'identityTokenTtl',
-      'accessKey',
-      'region',
-      'iamEndpoint',
-      'stsEndpoint',
-      'maxRetries',
-    ];
-    return expandAttributeMeta(this, keys);
+    const formFields = expandAttributeMeta(this, this.configurableParams);
+    return formFields.filter((attr) => attr.name !== 'secretKey');
   }
 
   // "filedGroupsWif" and "fieldGroupsIam" are passed to the FormFieldGroups component to determine which group to show in the form (ex: @groupName="fieldGroupsWif")

ui/app/models/gcp/config.js

@@ -25,6 +25,7 @@ export default class GcpConfig extends Model {
   })
   maxTtl;
 
+  /* GCP credential config field */
   @attr('string', {
     label: 'JSON credentials',
     subText:

ui/app/models/ssh/ca-config.js

@@ -38,16 +38,15 @@ export default class SshCaConfig extends Model {
   @attr('string') backend; // dynamic path of secret -- set on response from value passed to queryRecord
   @attr('string', { sensitive: true }) privateKey; // obfuscated, never returned by API
   @attr('string') publicKey;
-  @attr('boolean', { defaultValue: true })
-  generateSigningKey;
+  @attr('boolean', { defaultValue: true }) generateSigningKey;
+
+  configurableParams = ['privateKey', 'publicKey', 'generateSigningKey'];
 
-  // do not return private key for configuration.index view
   get displayAttrs() {
     return this.formFields.filter((attr) => attr.name !== 'privateKey');
   }
-  // return private key for edit/create view
+
   get formFields() {
-    const keys = ['privateKey', 'publicKey', 'generateSigningKey'];
-    return expandAttributeMeta(this, keys);
+    return expandAttributeMeta(this, this.configurableParams);
   }
 }

ui/tests/acceptance/secrets/backend/aws/aws-configuration-test.js

@@ -185,7 +185,7 @@ module('Acceptance | aws | configuration', function (hooks) {
       assert
         .dom(GENERAL.infoRowValue('Identity token TTL'))
         .doesNotExist('Identity token TTL does not show.');
-      assert.dom(GENERAL.infoRowValue('Maximum retries')).doesNotExist('Maximum retries does not show.');
+      assert.dom(GENERAL.infoRowValue('Max retries')).doesNotExist('Max retries does not show.');
       // cleanup
       await runCmd(`delete sys/mounts/${path}`);
     });
@@ -219,7 +219,6 @@ module('Acceptance | aws | configuration', function (hooks) {
     });
 
     test('it shows AWS mount configuration details', async function (assert) {
-      assert.expect(12);
       const path = `aws-${this.uid}`;
       const type = 'aws';
       this.server.get(`${path}/config/root`, (schema, req) => {
@@ -231,6 +230,7 @@ module('Acceptance | aws | configuration', function (hooks) {
       createConfig(this.store, path, type); // create the aws root config in the store
       await click(SES.configTab);
       for (const key of expectedConfigKeys(type)) {
+        if (key === 'Secret key') continue; // secret-key is not returned by the API
         assert.dom(GENERAL.infoRowLabel(key)).exists(`${key} on the ${type} config details exists.`);
         const responseKeyAndValue = expectedValueOfConfigKeys(type, key);
         assert
@@ -368,7 +368,7 @@ module('Acceptance | aws | configuration', function (hooks) {
         .doesNotExist('Access type section does not render for a community user');
       // check all the form fields are present
       await click(GENERAL.toggleGroup('Root config options'));
-      for (const key of expectedConfigKeys('aws-root-create')) {
+      for (const key of expectedConfigKeys('aws', true)) {
         assert.dom(GENERAL.inputByAttr(key)).exists(`${key} shows for root section.`);
       }
       for (const key of expectedConfigKeys('aws-lease')) {

ui/tests/acceptance/secrets/backend/azure/azure-configuration-test.js

@@ -94,6 +94,7 @@ module('Acceptance | Azure | configuration', function (hooks) {
         });
         await enablePage.enable(this.type, path);
         for (const key of expectedConfigKeys('azure')) {
+          if (key === 'Client secret') continue; // client-secret is not returned by the API
           assert.dom(GENERAL.infoRowLabel(key)).exists(`${key} on the ${this.type} config details exists.`);
           const responseKeyAndValue = expectedValueOfConfigKeys(this.type, key);
           assert

ui/tests/acceptance/secrets/backend/gcp/gcp-configuration-test.js

@@ -68,6 +68,8 @@ module('Acceptance | GCP | configuration', function (hooks) {
         service_account_email: 'service-email',
         identity_token_audience: 'audience',
         identity_token_ttl: 720000,
+        max_ttl: 14400,
+        ttl: 3600,
       };
       this.server.get(`${path}/config`, () => {
         assert.ok(true, 'request made to config when navigating to the configuration page.');
@@ -102,6 +104,7 @@ module('Acceptance | GCP | configuration', function (hooks) {
       });
       await enablePage.enable(this.type, path);
       for (const key of expectedConfigKeys(this.type)) {
+        if (key === 'Credentials') continue; // not returned by the API
         const responseKeyAndValue = expectedValueOfConfigKeys(this.type, key);
         assert
           .dom(GENERAL.infoRowValue(key))