From f99f9c39a0fcc45f3a905af1fd08086cd4945541 Mon Sep 17 00:00:00 2001 From: Bilal Boussayoud Date: Tue, 4 Jan 2022 14:36:27 -0700 Subject: [PATCH 01/10] observe unit test failures --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0c93f25f..8520e37e 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ test-integ: test version ?= latest test-docker: - curl -s https://raw.githubusercontent.com/sendgrid/sendgrid-oai/HEAD/prism/prism.sh -o prism.sh + curl -s https://raw.githubusercontent.com/sendgrid/sendgrid-oai/cert-fix/prism/prism.sh -o prism.sh version=$(version) bash ./prism.sh clean: From f38d063b0547931149ec08f038b81067de7ba3aa Mon Sep 17 00:00:00 2001 From: Bilal Boussayoud Date: Tue, 4 Jan 2022 15:41:25 -0700 Subject: [PATCH 02/10] confirm that old cert doesn't fix tests --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 8520e37e..23d9c3fe 100644 --- a/Makefile +++ b/Makefile @@ -15,6 +15,7 @@ test: test-integ: test + version ?= latest test-docker: curl -s https://raw.githubusercontent.com/sendgrid/sendgrid-oai/cert-fix/prism/prism.sh -o prism.sh From be1f7da85988239d1e8bcf46d85fc25f0df1b22c Mon Sep 17 00:00:00 2001 From: Bilal Boussayoud Date: Wed, 5 Jan 2022 16:46:26 -0700 Subject: [PATCH 03/10] change alias name in cert import --- Dockerfile | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6587fff8..4405ed65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ RUN yum update -y \ RUN wget http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-maven.repo -O /etc/yum.repos.d/epel-apache-maven.repo \ && yum install -y maven || true RUN keytool -import -trustcacerts -cacerts -storepass changeit -noprompt \ - -alias api.sendgrid.com -file /usr/local/share/ca-certificates/cert.crt || true + -alias *.sendgrid.com -file /usr/local/share/ca-certificates/cert.crt || true WORKDIR /app COPY . . diff --git a/Makefile b/Makefile index 23d9c3fe..01d4d6fb 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ test-integ: test version ?= latest test-docker: - curl -s https://raw.githubusercontent.com/sendgrid/sendgrid-oai/cert-fix/prism/prism.sh -o prism.sh + curl -s https://raw.githubusercontent.com/sendgrid/sendgrid-oai/HEAD/prism/prism.sh -o prism.sh version=$(version) bash ./prism.sh clean: From 2b2842dbd7e2796b9ecd638390452b878c6f6429 Mon Sep 17 00:00:00 2001 From: Bilal Boussayoud Date: Thu, 6 Jan 2022 15:17:40 -0700 Subject: [PATCH 04/10] use different certs sans san --- Dockerfile | 4 ++-- Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4405ed65..98068f3a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM openjdk:$version # version <= 11 RUN apt-get update \ && apt-get install -y make maven || true -COPY prism/prism/nginx/cert.crt /usr/local/share/ca-certificates/cert.crt +COPY prism/prism/nginx/java_cert.crt /usr/local/share/ca-certificates/cert.crt RUN update-ca-certificates || true # version > 11 @@ -13,7 +13,7 @@ RUN yum update -y \ RUN wget http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-maven.repo -O /etc/yum.repos.d/epel-apache-maven.repo \ && yum install -y maven || true RUN keytool -import -trustcacerts -cacerts -storepass changeit -noprompt \ - -alias *.sendgrid.com -file /usr/local/share/ca-certificates/cert.crt || true + -alias api.sendgrid.com -file /usr/local/share/ca-certificates/cert.crt || true WORKDIR /app COPY . . diff --git a/Makefile b/Makefile index 01d4d6fb..23d9c3fe 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ test-integ: test version ?= latest test-docker: - curl -s https://raw.githubusercontent.com/sendgrid/sendgrid-oai/HEAD/prism/prism.sh -o prism.sh + curl -s https://raw.githubusercontent.com/sendgrid/sendgrid-oai/cert-fix/prism/prism.sh -o prism.sh version=$(version) bash ./prism.sh clean: From b57dc799064b2a6c3db2d758a5dc5750adb0b98f Mon Sep 17 00:00:00 2001 From: Bilal Boussayoud Date: Thu, 6 Jan 2022 15:52:52 -0700 Subject: [PATCH 05/10] test again --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 23d9c3fe..8520e37e 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,6 @@ test: test-integ: test - version ?= latest test-docker: curl -s https://raw.githubusercontent.com/sendgrid/sendgrid-oai/cert-fix/prism/prism.sh -o prism.sh From a5804c1ff64e342ea5a6ca014e2e89555ee665d7 Mon Sep 17 00:00:00 2001 From: Bilal Boussayoud Date: Thu, 6 Jan 2022 18:31:33 -0700 Subject: [PATCH 06/10] use cert in separate oai branch --- Dockerfile | 2 +- Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 98068f3a..6587fff8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM openjdk:$version # version <= 11 RUN apt-get update \ && apt-get install -y make maven || true -COPY prism/prism/nginx/java_cert.crt /usr/local/share/ca-certificates/cert.crt +COPY prism/prism/nginx/cert.crt /usr/local/share/ca-certificates/cert.crt RUN update-ca-certificates || true # version > 11 diff --git a/Makefile b/Makefile index 8520e37e..d3b8be43 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ test-integ: test version ?= latest test-docker: - curl -s https://raw.githubusercontent.com/sendgrid/sendgrid-oai/cert-fix/prism/prism.sh -o prism.sh + curl -s https://raw.githubusercontent.com/sendgrid/sendgrid-oai/sendgrid-java-cert/prism/prism.sh -o prism.sh version=$(version) bash ./prism.sh clean: From 6bf83e6e380e40678925d4b9a7ce59460534ef72 Mon Sep 17 00:00:00 2001 From: Bilal Boussayoud Date: Thu, 6 Jan 2022 20:00:26 -0700 Subject: [PATCH 07/10] rerun tests --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 6587fff8..49026489 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,7 @@ RUN wget http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-mave RUN keytool -import -trustcacerts -cacerts -storepass changeit -noprompt \ -alias api.sendgrid.com -file /usr/local/share/ca-certificates/cert.crt || true + WORKDIR /app COPY . . From 462cb7cf15f3e97e65f7e53a808bb68339531eb5 Mon Sep 17 00:00:00 2001 From: Bilal Boussayoud Date: Thu, 6 Jan 2022 20:40:10 -0700 Subject: [PATCH 08/10] Revert "rerun tests" This reverts commit 6bf83e6e380e40678925d4b9a7ce59460534ef72. --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 49026489..6587fff8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,6 @@ RUN wget http://repos.fedorapeople.org/repos/dchen/apache-maven/epel-apache-mave RUN keytool -import -trustcacerts -cacerts -storepass changeit -noprompt \ -alias api.sendgrid.com -file /usr/local/share/ca-certificates/cert.crt || true - WORKDIR /app COPY . . From 899e5b1d944c6a58720d79e4c469321bd3f4a895 Mon Sep 17 00:00:00 2001 From: Bilal Boussayoud Date: Fri, 7 Jan 2022 10:35:31 -0700 Subject: [PATCH 09/10] update makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d3b8be43..7536338d 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ test-integ: test version ?= latest test-docker: - curl -s https://raw.githubusercontent.com/sendgrid/sendgrid-oai/sendgrid-java-cert/prism/prism.sh -o prism.sh + curl -s https://raw.githubusercontent.com/sendgrid/sendgrid-oai/sendgrid-java-cert/prism/prism-java.sh -o prism.sh version=$(version) bash ./prism.sh clean: From 1499ef147e2415b72053b26c72d3d418eb30f3f2 Mon Sep 17 00:00:00 2001 From: Bilal Boussayoud Date: Fri, 7 Jan 2022 10:42:47 -0700 Subject: [PATCH 10/10] switch to HEAD branch --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7536338d..5bd698c8 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ test-integ: test version ?= latest test-docker: - curl -s https://raw.githubusercontent.com/sendgrid/sendgrid-oai/sendgrid-java-cert/prism/prism-java.sh -o prism.sh + curl -s https://raw.githubusercontent.com/sendgrid/sendgrid-oai/HEAD/prism/prism-java.sh -o prism.sh version=$(version) bash ./prism.sh clean: