Skip to content

Commit

Permalink
Feature/helm s3 (#30)
Browse files Browse the repository at this point in the history
* add helm-s3 plugin to anvil

* add s3 shellspec test

* Correctly set helm s3 plugin version

* Update Helm S3 plugin name in spec

* Don't let grep colors break a test

* Add quote that I inadvertantly took away

Co-authored-by: Brad Staton <47569500+saic-statonb@users.noreply.github.com>
  • Loading branch information
scaneer and saic-statonb authored Sep 9, 2021
1 parent c92cc62 commit 0b4ebe6
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
13 changes: 13 additions & 0 deletions spec/helm_s3_spec.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/usr/bin/env shellspec

Describe "printVersion()"
printVersion() {
helm plugin list | grep "s3" | grep "${HELM_S3_VERSION}"
}

It "validates tool is installed by checking version"
When call printVersion
The output should include "${HELM_S3_VERSION}"
The status should eq 0
End
End
2 changes: 1 addition & 1 deletion spec/serverless_spec.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Describe "printVersion()"
printVersion() {
serverless --version | grep "${SERVERLESS_VERSION}"
serverless --version | grep --color=never "${SERVERLESS_VERSION}"
}

It "validates tool is installed by checking version"
Expand Down
7 changes: 7 additions & 0 deletions src/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,13 @@ RUN helm plugin install https://github.com/aslafy-z/helm-git.git --version "${HE
&& asdf reshim helm \
&& rm -rf /var/tmp/* /tmp/* /var/tmp/.???* /tmp/.???*

# Install helm-s3 plugin. Get versions from https://github.com/hypnoglow/helm-s3/releases
ARG HELM_S3_VERSION="0.10.0"
ENV HELM_S3_VERSION=${HELM_S3_VERSION}
RUN helm plugin install https://github.com/hypnoglow/helm-s3.git --version "${HELM_S3_VERSION}" \
&& asdf reshim helm \
&& rm -rf /var/tmp/* /tmp/* /var/tmp/.???* /tmp/.???*

# Install helmfile. Get versions using 'asdf list all helmfile'.
ARG HELMFILE_VERSION="0.138.2"
ENV HELMFILE_VERSION=${HELMFILE_VERSION}
Expand Down

0 comments on commit 0b4ebe6

Please sign in to comment.