correct fips version delimiter

hashicorp · Jul 12, 2023 · b9bac06 · b9bac06
1 parent 1afc1d0
commit b9bac06
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -74,8 +74,8 @@ jobs:
           - {goos: "linux", goarch: "arm64"}
           - {goos: "linux", goarch: "386"}
           - {goos: "linux", goarch: "amd64"}
-          - {goos: "linux", goarch: "amd64", gotags: "fips", env: "CGO_ENABLED=1 GOEXPERIMENT=boringcrypto", fips: ".fips1402" }
-          - {goos: "linux", goarch: "arm64", gotags: "fips", env: "CGO_ENABLED=1 GOEXPERIMENT=boringcrypto CC=aarch64-linux-gnu-gcc", fips: ".fips1402"}
+          - {goos: "linux", goarch: "amd64", gotags: "fips", env: "CGO_ENABLED=1 GOEXPERIMENT=boringcrypto", fips: "+fips1402" }
+          - {goos: "linux", goarch: "arm64", gotags: "fips", env: "CGO_ENABLED=1 GOEXPERIMENT=boringcrypto CC=aarch64-linux-gnu-gcc", fips: "+fips1402"}
 
       fail-fast: true
 
@@ -93,7 +93,7 @@ jobs:
           arch: ${{ matrix.goarch }}
           reproducible: assert
           instructions: |
-            if [[ "${{ matrix.fips }}" == ".fips1402" ]]
+            if [[ "${{ matrix.fips }}" == "+fips1402" ]]
             then
               sudo apt-get update --allow-releaseinfo-change-suite --allow-releaseinfo-change-version && sudo apt-get install -y build-essential gcc-aarch64-linux-gnu
             fi
@@ -174,9 +174,9 @@ jobs:
         # supported by Envoy.
         include:
           - { arch: "amd64" }
-          - { arch: "amd64", fips: ".fips1402" }
+          - { arch: "amd64", fips: "+fips1402" }
           - { arch: "arm64" }
-          - { arch: "arm64", fips: ".fips1402" }
+          - { arch: "arm64", fips: "+fips1402" }
     env:
       repo: ${{ github.event.repository.name }}
       version: ${{ needs.get-product-version.outputs.product-version }}${{ matrix.fips }}
@@ -243,7 +243,7 @@ jobs:
       matrix:
         include:
           - { target-name: "release-ubi", registry-id: "631f805e0d15f623c5996c2e" }
-          - { target-name: "release-fips-ubi", registry-id: "6484fd31685105da62a96b24", fips: ".fips1402" }
+          - { target-name: "release-fips-ubi", registry-id: "6484fd31685105da62a96b24", fips: "+fips1402" }
 
     env:
       repo: ${{github.event.repository.name}}
@@ -268,7 +268,7 @@ jobs:
       matrix:
         include:
           - { arch: "amd64" }
-          - { arch: "amd64", fips: ".fips1402" }
+          - { arch: "amd64", fips: "+fips1402" }
     env:
       repo: ${{ github.event.repository.name }}
       version: ${{ needs.get-product-version.outputs.product-version }}${{ matrix.fips }}

diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -39,7 +39,7 @@ func GetHumanVersion() string {
 	}
 
 	if IsFIPS() {
-		version = fmt.Sprintf("%s.fips1402", version)
+		version = fmt.Sprintf("%s+fips1402", version)
 	}
 
 	// Strip off any single quotes added by the git information.