Skip to content
This repository has been archived by the owner on Jul 26, 2022. It is now read-only.

Commit

Permalink
fix(rbac): adjust the poller upsert code so it doesn't need get (#22)
Browse files Browse the repository at this point in the history
  • Loading branch information
silasbw committed Feb 20, 2019
1 parent 3b5c5d9 commit 5cffe97
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 27 deletions.
22 changes: 4 additions & 18 deletions lib/poller.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,27 +78,13 @@ class Poller {
const secretManifest = await this._createSecretManifest({ secretDescriptor });
const kubeNamespace = this._kubeClient.api.v1.namespaces(this._namespace);

let kubeSecret = null;
this._logger.info(`upserting secret ${secretName}`);
try {
this._logger.info(`fetching secret ${secretName}`);
kubeSecret = await kubeNamespace.secrets(secretName).get();
return await kubeNamespace.secrets.post({ body: secretManifest });
} catch (err) {
// NOTE(jdaeli): If Not Found error, create the secret
// otherwise throw the error
if (err.statusCode !== 404) {
throw err;
}
if (err.statusCode !== 409) throw err;
return await kubeNamespace.secrets(secretName).put({ body: secretManifest });
}

// NOTE(jdaeli): if kube secret doesn't exist, create the secret
// otherwise update/patch it
if (!kubeSecret) {
this._logger.info(`creating secret ${secretName}`);
return kubeNamespace.secrets.post({ body: secretManifest });
}

this._logger.info(`updating secret ${secretName}`);
return kubeNamespace.secrets(secretName).put({ body: secretManifest });
}

/**
Expand Down
13 changes: 4 additions & 9 deletions lib/poller.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -159,16 +159,10 @@ describe('Poller', () => {
});

it('creates new secret', async () => {
const notFoundError = new Error('Not Found');
notFoundError.statusCode = 404;

kubeNamespaceMock.get = sinon.stub().throws(notFoundError);
kubeNamespaceMock.secrets.post = sinon.stub().resolves();

await poller._upsertKubernetesSecret(upsertSecretParams);

expect(kubeNamespaceMock.secrets.calledWith('fakeSecretName')).to.be.true;
expect(kubeNamespaceMock.get.called).to.be.true;
expect(kubeNamespaceMock.secrets.post.calledWith({
body: {
apiVersion: 'v1',
Expand All @@ -185,13 +179,14 @@ describe('Poller', () => {
});

it('updates secret', async () => {
kubeNamespaceMock.get = sinon.stub().resolves({ fakeSecretName: 'fakeSecretString' });
const conflictError = new Error('Conflict');
conflictError.statusCode = 409;
kubeNamespaceMock.secrets.post = sinon.stub().throws(conflictError);
kubeNamespaceMock.put = sinon.stub().resolves();

await poller._upsertKubernetesSecret(upsertSecretParams);

expect(kubeNamespaceMock.secrets.calledWith('fakeSecretName')).to.be.true;
expect(kubeNamespaceMock.get.called).to.be.true;
expect(kubeNamespaceMock.put.calledWith({
body: {
apiVersion: 'v1',
Expand All @@ -211,7 +206,7 @@ describe('Poller', () => {
const internalErrorServer = new Error('Internal Error Server');
internalErrorServer.statusCode = 500;

kubeNamespaceMock.get = sinon.stub().throws(internalErrorServer);
kubeNamespaceMock.secrets.post = sinon.stub().throws(internalErrorServer);

let error;

Expand Down

0 comments on commit 5cffe97

Please sign in to comment.