Fix release workflow (#724)

Author: dhurley

.github/workflows/release-branch.yml

@@ -182,8 +182,9 @@ jobs:
         if: ${{ inputs.publishPackages == true }}
         env:
           TOKEN: ${{ inputs.uploadJWT }}
+          UPLOAD_URL: ${{ secrets.UPLOAD_URL }}
         run: |
-          UPLOAD_URL=${{ secrets.UPLOAD_URL}} make release
+          make release
       - name: Publish Github Release
         if: ${{ inputs.publishPackages == true }}
         uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1

Makefile.packaging

@@ -24,8 +24,6 @@ ALMA_ARCHS?=aarch64 x86_64
 AMAZON_VERSIONS?=amazon-2 amazon-2023
 AMAZON_ARCHS?=aarch64 x86_64
 
-UPLOAD_URL ?= "https://up-ap.nginx.com/"
-
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 # Release Packaging                                                                                               #
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

sdk/config_helpers.go

@@ -174,8 +174,8 @@ func updateNginxConfigFromPayload(
 
 	// cache the directory map, so we can look up using the base
 	directoryMap := newDirectoryMap()
-	formatMap := map[string]string{}  // map of accessLog/errorLog formats
-	seen := make(map[string]struct{}) // local cache of seen files
+	formatMap := map[string]string{}                // map of accessLog/errorLog formats
+	seen := make(map[string]struct{})               // local cache of seen files
 	seenCerts := make(map[string]*x509.Certificate) // local cache of seen certs
 
 	// Add files to the zipped config in a consistent order.

sdk/config_helpers_test.go

@@ -512,8 +512,8 @@ var tests = []struct {
 			},
 		},
 		expectedAuxFiles: map[string]struct{}{
-			"/tmp/testdata/foo/test.html": {},
-			"/tmp/testdata/nginx/ca/ca.crt":  {},
+			"/tmp/testdata/foo/test.html":   {},
+			"/tmp/testdata/nginx/ca/ca.crt": {},
 		},
 	},
 	{
@@ -795,8 +795,8 @@ var tests = []struct {
 			},
 		},
 		expectedAuxFiles: map[string]struct{}{
-			"/tmp/testdata/foo/test.html": {},
-			"/tmp/testdata/nginx/ca/ca.crt":  {},
+			"/tmp/testdata/foo/test.html":   {},
+			"/tmp/testdata/nginx/ca/ca.crt": {},
 		},
 	},
 }
@@ -883,7 +883,7 @@ func TestGetNginxConfig(t *testing.T) {
 				resultFile := resultDir.Files[fileIndex]
 				assert.Equal(t, expectedFile.Name, resultFile.Name)
 				assert.Equal(t, expectedFile.Permissions, resultFile.Permissions)
-				assert.Equal(t, expectedFile.Lines, resultFile.Lines, "unexpected line count for " + expectedDirectory.Name + "/" +expectedFile.Name)
+				assert.Equal(t, expectedFile.Lines, resultFile.Lines, "unexpected line count for "+expectedDirectory.Name+"/"+expectedFile.Name)
 			}
 		}
 
@@ -1520,9 +1520,9 @@ func getCertMeta(file string) crtMetaFields {
 }
 
 func generateCertificates(algoname string) error {
-	certs := []string { "ca", "proxy", "trusted" }
+	certs := []string{"ca", "proxy", "trusted"}
 	var cmd1 *exec.Cmd
-	
+
 	for _, cert := range certs {
 		local := fmt.Sprintf("'%s.local'", cert)
 		output := fmt.Sprintf("certs/conf/%s/", cert)