[CAD-691] GitHub actions migration #368

jbropho · 2024-02-28T13:42:20Z

env vars added for kafka hostname etc in tests; could be accessed via localhost in circleci, cannot in github actions
license added to project.clj, lein auto adds this to the pom when present, became mandatory to have a license in your pom when pushing to clojars on 23/12/23 - https://clojureverse.org/t/ann-clojars-now-requires-a-license-in-the-pom-for-new-projects-or-projects-that-already-specify-a-license/10347/2?u=tcrawley
github actions setup + circleci removed
deploy step uses a protected env clojars_deploy - running this step requires approval from a required approver (@FundingCircle/team-credit-application and @FundingCircle/jackdaw) currently

fc-infosec-sast · 2024-02-28T13:42:50Z

✅ SAST Report

No issues found. Good job! 💪

james-doolan

Minor comments regarding consistent use of env vars

james-doolan · 2024-03-01T12:43:49Z

README.md

@@ -42,6 +46,10 @@ Anyone with the appropriate credentials can "cut a release" of jackdaw using the

 Steps 2 to 6 is essentially `git tag $version -m "$title\n\n$description" && git push --tags`

+#### Snapshot release
+
+Snapshot releases can be created by pushing a tag with the format `publish-snapshot-semver`


Does this mean anyone can publish a snapshot release with any version they want?

Described slightly higher in the README, deploy env is protected, deploy step cannot run without approval from jackdaw or credit-applications team review.

In any case outside contributors don't have write access, PR's are opened via forks.

james-doolan · 2024-03-01T12:45:28Z

project.clj


  :git-version
  {:status-to-version
   (fn [{:keys [tag branch ahead? dirty?] :as git}]
-     (if (and tag (not ahead?) (not dirty?))
+     (if (and tag (not ahead?) (not dirty?) (= "master" branch))


Should this be handled with trigger filters in the workflow def?

Added to make more explicit that all non-master builds are marked snapshot; it should be handled already by the current setup, happy to remove it if it adds confusion.

james-doolan · 2024-03-01T12:48:54Z

test/jackdaw/test/commands/write_test.clj

@@ -40,7 +40,7 @@
                   :key-serde :long
                   :value-serde :json}))

-(def kafka-config {"bootstrap.servers" "localhost:9092"
+(def kafka-config {"bootstrap.servers" "kafka:9092"


Suggested change

(def kafka-config {"bootstrap.servers" "kafka:9092"

(def kafka-config {"bootstrap.servers" (str (utils/bootstrap-servers) ":9092")

james-doolan · 2024-03-01T12:50:37Z

test/jackdaw/test/transports/rest_proxy_test.clj

+   :config {"bootstrap.servers" "kafka:9092"
            "application.id" app-id}})


Suggested change

:config {"bootstrap.servers" "kafka:9092"

"application.id" app-id}})

:config (merge kafka-config {"application.id" app-id})})

james-doolan · 2024-03-01T12:52:09Z

test/jackdaw/test_test.clj

+                                                                                    {"bootstrap.servers" (str (utils/bootstrap-servers) ":9092")
                                                                                     "application.id" "test-echo-stream"})


Suggested change

{"bootstrap.servers" (str (utils/bootstrap-servers) ":9092")

"application.id" "test-echo-stream"})

(assoc kafka-config "application.id" "test-echo-stream")

update other cases too

jbropho added 2 commits February 28, 2024 13:33

Adds license to project.clj

a194e57

Use env vars for host resolution in tests

0ae72f1

jbropho had a problem deploying to test February 28, 2024 14:56 — with GitHub Actions Failure

jbropho added 3 commits February 28, 2024 15:02

Setup github action workflows

4409f80

Update README

84d79a7

Remove circleci config

deaed50

jbropho force-pushed the CAD-691-github-actions-migration branch from 34d72a7 to deaed50 Compare February 28, 2024 15:02

jbropho changed the title ~~Cad 691 GitHub actions migration~~ [CAD-691] GitHub actions migration Feb 28, 2024

jbropho marked this pull request as ready for review February 28, 2024 15:07

jbropho requested a review from a team as a code owner February 28, 2024 15:07

james-doolan reviewed Mar 1, 2024

View reviewed changes

Address review comments

3291ffd

jbropho force-pushed the CAD-691-github-actions-migration branch 6 times, most recently from 9ad0d45 to f806698 Compare March 7, 2024 17:19

Make port configurable in tests via env var

88e227c

jbropho force-pushed the CAD-691-github-actions-migration branch from f806698 to 88e227c Compare March 7, 2024 17:24

james-doolan approved these changes Mar 11, 2024

View reviewed changes

jbropho merged commit 3dc4b18 into master Mar 12, 2024
4 of 5 checks passed

jbropho deleted the CAD-691-github-actions-migration branch March 12, 2024 15:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CAD-691] GitHub actions migration #368

[CAD-691] GitHub actions migration #368

jbropho commented Feb 28, 2024 •

edited

Loading

fc-infosec-sast commented Feb 28, 2024 •

edited

Loading

james-doolan left a comment

james-doolan Mar 1, 2024

jbropho Mar 4, 2024 •

edited

Loading

james-doolan Mar 1, 2024

jbropho Mar 4, 2024 •

edited

Loading

james-doolan Mar 1, 2024

james-doolan Mar 1, 2024

james-doolan Mar 1, 2024

	(def kafka-config {"bootstrap.servers" "kafka:9092"
	(def kafka-config {"bootstrap.servers" (str (utils/bootstrap-servers) ":9092")

		:config {"bootstrap.servers" "kafka:9092"
		"application.id" app-id}})

	:config {"bootstrap.servers" "kafka:9092"
	"application.id" app-id}})
	:config (merge kafka-config {"application.id" app-id})})

		{"bootstrap.servers" (str (utils/bootstrap-servers) ":9092")
		"application.id" "test-echo-stream"})

	{"bootstrap.servers" (str (utils/bootstrap-servers) ":9092")
	"application.id" "test-echo-stream"})
	(assoc kafka-config "application.id" "test-echo-stream")

[CAD-691] GitHub actions migration #368

[CAD-691] GitHub actions migration #368

Conversation

jbropho commented Feb 28, 2024 • edited Loading

fc-infosec-sast commented Feb 28, 2024 • edited Loading

✅ SAST Report

james-doolan left a comment

Choose a reason for hiding this comment

james-doolan Mar 1, 2024

Choose a reason for hiding this comment

jbropho Mar 4, 2024 • edited Loading

Choose a reason for hiding this comment

james-doolan Mar 1, 2024

Choose a reason for hiding this comment

jbropho Mar 4, 2024 • edited Loading

Choose a reason for hiding this comment

james-doolan Mar 1, 2024

Choose a reason for hiding this comment

james-doolan Mar 1, 2024

Choose a reason for hiding this comment

james-doolan Mar 1, 2024

Choose a reason for hiding this comment

jbropho commented Feb 28, 2024 •

edited

Loading

fc-infosec-sast commented Feb 28, 2024 •

edited

Loading

jbropho Mar 4, 2024 •

edited

Loading

jbropho Mar 4, 2024 •

edited

Loading