Merge pull request #1 from godaddy/fhemberger-crd0

Tweaks discussed in #149
godaddy · Nov 11, 2017 · 45b19eb · 45b19eb
2 parents 0e2e4e8 + 5b3ca64
commit 45b19eb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/lib/api-extensions.js b/lib/api-extensions.js
@@ -9,10 +9,10 @@ class ApiExtensions extends ApiGroup {
       path: 'apis/apiextensions.k8s.io',
       version: options.version || 'v1beta1',
       groupResources: [
-        'customresourcedefinition'
+        'customresourcedefinitions'
       ],
       namespaceResources: [
-        { name: 'customresourcedefinition', Constructor: CustomResourceDefiniton }
+        { name: 'customresourcedefinitions', Constructor: CustomResourceDefiniton }
       ]
     });
     super(options);

diff --git a/lib/custom-resource-definition.js b/lib/custom-resource-definition.js
@@ -5,7 +5,7 @@ const ApiGroup = require('./api-group');
 class CustomResourceDefinition extends ApiGroup {
   constructor(options) {
     options = Object.assign({}, options, {
-      path: options.group,
+      path: `apis/${ options.group }`,
       version: options.version || 'v1',
       groupResources: [],
       namespaceResources: []

diff --git a/test/api-extensions.test.js b/test/api-extensions.test.js
@@ -34,9 +34,9 @@ describe('lib.apiextensions', () => {
 
     beforeTesting('unit', () => {
       nock(common.apiExtensions.url)
-        .post(`${ common.apiExtensions.path }`)
+        .post(`${ common.apiExtensions.path }/customresourcedefinitions`)
         .reply(201, testApiExtensions)
-        .get(`${ common.apiExtensions.path }/${ testCustomResourceName }`)
+        .get(`${ common.apiExtensions.path }/customresourcedefinitions/${ testCustomResourceName }`)
         .reply(200, testApiExtensions);
     });
 
@@ -45,8 +45,8 @@ describe('lib.apiextensions', () => {
     // improvements to our integration test harness to make this work well.
     common.only('unit', 'can POST and GET', done => {
       async.series([
-        next => common.apiExtensions.post({ body: testApiExtensions }, next),
-        next => common.apiExtensions.get(testCustomResourceName, next)
+        next => common.apiExtensions.customresourcedefinitions.post({ body: testApiExtensions }, next),
+        next => common.apiExtensions.customresourcedefinitions.get(testCustomResourceName, next)
       ], (err, results) => {
         assume(err).is.falsy();
         const getResult = results[1];