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

Commit 5cffe97

Browse files
authored
fix(rbac): adjust the poller upsert code so it doesn't need get (#22)
1 parent 3b5c5d9 commit 5cffe97

File tree

2 files changed

+8
-27
lines changed

2 files changed

+8
-27
lines changed

lib/poller.js

+4-18
Original file line numberDiff line numberDiff line change
@@ -78,27 +78,13 @@ class Poller {
7878
const secretManifest = await this._createSecretManifest({ secretDescriptor });
7979
const kubeNamespace = this._kubeClient.api.v1.namespaces(this._namespace);
8080

81-
let kubeSecret = null;
81+
this._logger.info(`upserting secret ${secretName}`);
8282
try {
83-
this._logger.info(`fetching secret ${secretName}`);
84-
kubeSecret = await kubeNamespace.secrets(secretName).get();
83+
return await kubeNamespace.secrets.post({ body: secretManifest });
8584
} catch (err) {
86-
// NOTE(jdaeli): If Not Found error, create the secret
87-
// otherwise throw the error
88-
if (err.statusCode !== 404) {
89-
throw err;
90-
}
85+
if (err.statusCode !== 409) throw err;
86+
return await kubeNamespace.secrets(secretName).put({ body: secretManifest });
9187
}
92-
93-
// NOTE(jdaeli): if kube secret doesn't exist, create the secret
94-
// otherwise update/patch it
95-
if (!kubeSecret) {
96-
this._logger.info(`creating secret ${secretName}`);
97-
return kubeNamespace.secrets.post({ body: secretManifest });
98-
}
99-
100-
this._logger.info(`updating secret ${secretName}`);
101-
return kubeNamespace.secrets(secretName).put({ body: secretManifest });
10288
}
10389

10490
/**

lib/poller.test.js

+4-9
Original file line numberDiff line numberDiff line change
@@ -159,16 +159,10 @@ describe('Poller', () => {
159159
});
160160

161161
it('creates new secret', async () => {
162-
const notFoundError = new Error('Not Found');
163-
notFoundError.statusCode = 404;
164-
165-
kubeNamespaceMock.get = sinon.stub().throws(notFoundError);
166162
kubeNamespaceMock.secrets.post = sinon.stub().resolves();
167163

168164
await poller._upsertKubernetesSecret(upsertSecretParams);
169165

170-
expect(kubeNamespaceMock.secrets.calledWith('fakeSecretName')).to.be.true;
171-
expect(kubeNamespaceMock.get.called).to.be.true;
172166
expect(kubeNamespaceMock.secrets.post.calledWith({
173167
body: {
174168
apiVersion: 'v1',
@@ -185,13 +179,14 @@ describe('Poller', () => {
185179
});
186180

187181
it('updates secret', async () => {
188-
kubeNamespaceMock.get = sinon.stub().resolves({ fakeSecretName: 'fakeSecretString' });
182+
const conflictError = new Error('Conflict');
183+
conflictError.statusCode = 409;
184+
kubeNamespaceMock.secrets.post = sinon.stub().throws(conflictError);
189185
kubeNamespaceMock.put = sinon.stub().resolves();
190186

191187
await poller._upsertKubernetesSecret(upsertSecretParams);
192188

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

214-
kubeNamespaceMock.get = sinon.stub().throws(internalErrorServer);
209+
kubeNamespaceMock.secrets.post = sinon.stub().throws(internalErrorServer);
215210

216211
let error;
217212

0 commit comments

Comments
 (0)