Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove support for Conjur v4, use CLI v8.0 #505

Merged
merged 1 commit into from
Mar 17, 2023
Merged

Remove support for Conjur v4, use CLI v8.0 #505

merged 1 commit into from
Mar 17, 2023

Conversation

szh
Copy link
Contributor

@szh szh commented Mar 13, 2023 •
edited
Loading

Desired Outcome

  • Update tests to use Conjur CLI v8.0
  • Remove support for Conjur v4

Connected Issue/Story

CyberArk internal issue ID: ONYX-33379

Definition of Done

At least 1 todo must be completed in the sections below for the PR to be
merged.

Changelog

  • The CHANGELOG has been updated, or
  • This PR does not include user-facing changes and doesn't require a
    CHANGELOG update

Test coverage

  • This PR includes new unit and integration tests to go with the code
    changes, or
  • The changes in this PR do not require tests

Documentation

  • Docs (e.g. READMEs) were updated in this PR
  • A follow-up issue to update official docs has been filed here: [insert issue ID]
  • This PR does not require updating any documentation

Behavior

  • This PR changes product behavior and has been reviewed by a PO, or
  • These changes are part of a larger initiative that will be reviewed later, or
  • No behavior was changed with this PR

Security

  • Security architect has reviewed the changes in this PR,
  • These changes are part of a larger initiative with a separate security review, or
  • There are no security aspects to these changes

@szh szh self-assigned this Mar 13, 2023
@szh szh force-pushed the cli8 branch 4 times, most recently from 2e28a8f to cd8920e Compare March 14, 2023 13:56
@szh szh marked this pull request as ready for review March 14, 2023 15:42
@szh szh requested a review from a team as a code owner March 14, 2023 15:42
@szh szh marked this pull request as draft March 14, 2023 15:43
@szh szh force-pushed the cli8 branch 3 times, most recently from 73e0cc4 to 1e8e575 Compare March 14, 2023 20:20
@szh szh mentioned this pull request Mar 14, 2023
Merged
13 tasks
@szh szh force-pushed the cli8 branch 2 times, most recently from 2c3ae06 to 04d4ea0 Compare March 15, 2023 20:46
@szh szh marked this pull request as ready for review March 15, 2023 20:47
john-odonnell
john-odonnell reviewed Mar 15, 2023
View reviewed changes
Dockerfile
@@ -148,6 +148,8 @@ RUN git clone https://github.com/ztombol/bats-support /bats/bats-support && \
RUN wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/bin/yq && \
chmod +x /usr/bin/yq

RUN sed -i "s|v0.4.1-0.20230214201333-88ed8ca3307d|v0.7.0|g" /usr/local/go/src/go.mod
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this meant to do?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes. I copied this from #503 to mitigate a container security issue being flagged. I actually left a comment on that PR for @rpothier asking whether this is meant to be temporary or... So I'm not sure yet basically ;)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes this is temporary. Added a grep command in #503 to force a script failure when the version changes so we don't forget to remove this.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great. I copied that here as well

CHANGELOG.md Show resolved Hide resolved
bin/test-workflow/7_app_deploy.sh
@@ -13,7 +13,7 @@ check_env_var SECRETS_PROVIDER_TAG
check_env_var SECRETLESS_BROKER_TAG

# Upon error, dump kubernetes resources in the application Namespace
# trap dump_application_namespace_upon_error EXIT
trap dump_application_namespace_upon_error EXIT
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we want to keep this in, should probably change this to a trap on ERR so we don't dump logs every run.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like the dump_application_namespace_upon_error function checks whether there's an error. I'm not sure why it's done this way but that's the way it is in all the other scripts to it's probably worth keeping consistent.

rpothier
rpothier approved these changes Mar 17, 2023
View reviewed changes
Copy link
Contributor

@rpothier rpothier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@szh szh merged commit f48a250 into master Mar 17, 2023
@szh szh deleted the cli8 branch March 17, 2023 18:48
@john-odonnell john-odonnell mentioned this pull request Apr 21, 2023
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@john-odonnell john-odonnell john-odonnell left review comments

@rpothier rpothier rpothier approved these changes

Assignees

@szh szh

Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@szh @rpothier @john-odonnell