updates kubernetes check env vars endpoint (#18588)

hashicorp · Jan 3, 2023 · 68d0bfe · 68d0bfe
1 parent 423132d
commit 68d0bfe
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/ui/app/adapters/kubernetes/config.js b/ui/app/adapters/kubernetes/config.js
@@ -4,8 +4,8 @@ import { encodePath } from 'vault/utils/path-encoding-helpers';
 export default class KubernetesConfigAdapter extends ApplicationAdapter {
   namespace = 'v1';
 
-  getURL(backend) {
-    return `${this.buildURL()}/${encodePath(backend)}/config`;
+  getURL(backend, path = 'config') {
+    return `${this.buildURL()}/${encodePath(backend)}/${path}`;
   }
   urlForUpdateRecord(name, modelName, snapshot) {
     return this.getURL(snapshot.attr('backend'));
@@ -33,7 +33,6 @@ export default class KubernetesConfigAdapter extends ApplicationAdapter {
     return this.ajax(url, 'POST', { data }).then(() => data);
   }
   checkConfigVars(backend) {
-    // this endpoint has yet to be created so this url is a mock for now and wired up in the mirage handler
-    return this.ajax(`${this.getURL(backend)}/vars`, 'GET');
+    return this.ajax(`${this.getURL(backend, 'check')}`, 'GET');
   }
 }
diff --git a/ui/mirage/handlers/kubernetes.js b/ui/mirage/handlers/kubernetes.js
@@ -1,9 +1,5 @@
 import { Response } from 'miragejs';
 
-// yet to be defined endpoint
-// exporting to use in tests in case it changes
-export const configVarUri = '/:path/config/vars';
-
 export default function (server) {
   const getRecord = (schema, req, dbKey) => {
     const { path, name } = req.params;
@@ -41,10 +37,16 @@ export default function (server) {
   server.delete('/:path/config', (schema, req) => {
     return deleteRecord(schema, req, 'kubernetesConfigs');
   });
-  // to be defined endpoint for checking for environment variables necessary for inferred config
-  server.get(configVarUri, () => {
+  // endpoint for checking for environment variables necessary for inferred config
+  server.get('/:path/check', () => {
+    const response = {};
     const status = Math.random() > 0.5 ? 204 : 404;
-    return new Response(status, {});
+    if (status === 404) {
+      response.errors = [
+        'Missing environment variables: KUBERNETES_SERVICE_HOST, KUBERNETES_SERVICE_PORT_HTTPS',
+      ];
+    }
+    return new Response(status, response);
   });
   server.get('/:path/roles', (schema) => {
     return {

diff --git a/ui/tests/integration/components/kubernetes/page/configure-test.js b/ui/tests/integration/components/kubernetes/page/configure-test.js
@@ -4,7 +4,6 @@ import { setupEngine } from 'ember-engines/test-support';
 import { setupMirage } from 'ember-cli-mirage/test-support';
 import { render, click, waitUntil, find, fillIn } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
-import { configVarUri } from '../../../../../mirage/handlers/kubernetes';
 import { Response } from 'miragejs';
 import sinon from 'sinon';
 
@@ -58,7 +57,7 @@ module('Integration | Component | kubernetes | Page::Configure', function (hooks
     assert.expect(8);
 
     let status = 404;
-    this.server.get(configVarUri, () => {
+    this.server.get('/:path/check', () => {
       assert.ok(
         waitUntil(() => find('[data-test-config] button').disabled),
         'Button is disabled while request is in flight'