ci: build docker only when secrets are present

Fix: use direct comparison instead of strings.Contains to filter layernames chore: fix inaccessible secrets chore: fix invalid mapping
go-spatial · Jul 3, 2024 · aa8e390 · aa8e390
1 parent c5bb076
commit aa8e390
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/.github/workflows/on_release_publish.yml b/.github/workflows/on_release_publish.yml
@@ -1,12 +1,13 @@
 name: On release publish
 on: 
-  push:
   pull_request:
+  push:
+    branches:
+      - master
   release:
     types: [published]
 
 jobs:
-
   gen_version:
     name: Generate software version
     runs-on: ubuntu-22.04
@@ -223,6 +224,8 @@ jobs:
     needs: [gen_version,build_ui]
     runs-on: ubuntu-22.04
     env:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       DOCKERHUB_ORG: gospatial
       DOCKERHUB_REPO: tegola
       BUILD_ARGS: |
@@ -243,6 +246,7 @@ jobs:
 
     - name: Login to Docker Hub
       uses: docker/login-action@v3
+      if: env.DOCKERHUB_USERNAME != '' && env.DOCKERHUB_TOKEN != ''
       with:
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -259,6 +263,7 @@ jobs:
     # we are not rebuilding linux/amd64
     - name: Build docker image for testing
       uses: docker/build-push-action@v5
+      if: env.DOCKERHUB_USERNAME != '' && env.DOCKERHUB_TOKEN != ''
       with:
         context: .
         load: true
@@ -267,6 +272,7 @@ jobs:
         tags: ${{ env.DOCKERHUB_ORG }}/${{ env.DOCKERHUB_REPO }}:${{ env.VERSION }}
 
     - name: Test image build
+      if: env.DOCKERHUB_USERNAME != '' && env.DOCKERHUB_TOKEN != ''
       run: |
         docker run --rm ${DOCKERHUB_ORG}/${DOCKERHUB_REPO}:${VERSION} version
 

diff --git a/atlas/map.go b/atlas/map.go
@@ -167,7 +167,7 @@ func (m Map) FilterLayersByName(names ...string) Map {
 	nameStr := strings.Join(names, ",")
 	for i := range m.Layers {
 		// if we have a name set, use it for the lookup
-		if m.Layers[i].Name != "" && strings.Contains(nameStr, m.Layers[i].Name) {
+		if m.Layers[i].Name != "" && nameStr == m.Layers[i].Name {
 			layers = append(layers, m.Layers[i])
 			continue
 		} else if m.Layers[i].ProviderLayerName != "" && strings.Contains(nameStr, m.Layers[i].ProviderLayerName) { // default to using the ProviderLayerName for the lookup

diff --git a/atlas/map_test.go b/atlas/map_test.go
@@ -176,6 +176,26 @@ func TestMapFilterLayersByName(t *testing.T) {
 				},
 			},
 		},
+		{
+			grid: atlas.Map{
+				Layers: []atlas.Layer{
+					{
+						Name: "layer1",
+					},
+					{
+						Name: "layer1roads",
+					},
+				},
+			},
+			name: "layer1roads",
+			expected: atlas.Map{
+				Layers: []atlas.Layer{
+					{
+						Name: "layer1roads",
+					},
+				},
+			},
+		},
 	}
 
 	for i, tc := range testcases {