Merge branch 'main' into add-auxiliary-command-server-proto

Author: aphralG

.github/workflows/release-branch.yml

@@ -28,7 +28,7 @@ on:
         default: false
         type: boolean
       createPullRequest:
-        description: 'Create pull request back into v3'
+        description: 'Create pull request back into main'
         default: false
         type: boolean
       releaseBranch:
@@ -262,23 +262,6 @@ jobs:
           echo "$GPG_KEY" | base64 --decode > ${NFPM_SIGNING_KEY_FILE}
           make package
 
-      - name: Azure Login
-        if: ${{ inputs.uploadAzure == true }}
-        uses: azure/login@8c334a195cbb38e46038007b304988d888bf676a # v2.0.0
-        with:
-          creds: ${{ secrets.AZURE_CREDENTIALS }}
-
-      - name: Azure Upload Release Packages
-        if: ${{ inputs.uploadAzure == true }}
-        uses: azure/CLI@965c8d7571d2231a54e321ddd07f7b10317f34d9 # v2.0.0
-        with:
-          inlineScript: |
-            for i in ./build/azure/packages/nginx-agent*; do
-              echo "Uploading ${i} to nginx-agent/${GITHUB_REF##*/}/${i##*/}"
-              az storage blob upload --auth-mode=login -f "$i" -c ${{ secrets.AZURE_CONTAINER_NAME }} \
-              --account-name ${{ secrets.AZURE_ACCOUNT_NAME }} --overwrite -n nginx-agent/${GITHUB_REF##*/}/${i##*/}
-            done
-
       - name: Install GPG tools
         if: ${{ inputs.publishPackages == true }}
         run: |
@@ -302,34 +285,9 @@ jobs:
         run: |
           make release
 
-      - name: Upload Release Assets
-        if: ${{ needs.vars.outputs.github_release == 'true' }}
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        # clobber overwrites existing assets of the same name
-        run: |
-          gh release upload --clobber v${{ inputs.packageVersion }} \
-            $(find ./build/github/packages -type f \( -name "*.deb" -o -name "*.rpm" -o -name "*.pkg" -o -name "*.apk" \))
-
-      - name: Publish Github Release
-        if: ${{ needs.vars.outputs.github_release == 'true' }}
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        with:
-          script: |
-            const {RELEASE_ID} = process.env
-            const release = (await github.rest.repos.updateRelease({
-              owner: context.payload.repository.owner.login,
-              repo: context.payload.repository.name,
-              release_id: `${RELEASE_ID}`,
-              draft: false,
-            }))
-            console.log(`Release published: ${release.data.html_url}`)
-        env:
-          RELEASE_ID: ${{ needs.release-draft.outputs.release_id }}
-
   merge-release:
     if: ${{ needs.vars.outputs.create_pull_request == 'true' }}
-    name: Merge release branch back into V3 branch
+    name: Merge release branch back into main branch
     runs-on: ubuntu-22.04
     needs: [vars,tag-release]
     permissions:
@@ -346,11 +304,11 @@ jobs:
           script: |
             const { repo, owner } = context.repo;
             const result = await github.rest.pulls.create({
-              title: 'Merge ${{ github.ref_name }} back into v3',
+              title: 'Merge ${{ github.ref_name }} back into main',
               owner,
               repo,
               head: '${{ github.ref_name }}',
-              base: 'v3',
+              base: 'main',
               body: [
                 'This PR is auto-generated by the release workflow.'
               ].join('\n')

.github/workflows/upload-release-assets.yml

@@ -0,0 +1,102 @@
+name: Publish Release packages
+
+on:
+  workflow_dispatch:
+    inputs:
+      pkgRepo:
+        description: "Source repository to pull packages from"
+        type: string
+        default: ""
+      pkgVersion:
+        description: 'Agent version'
+        type: string
+        default: ""
+      uploadAzure:
+        description: 'Publish packages Azure storage'
+        type: boolean
+        default: false
+      uploadGithub:
+        description: 'Publish packages to GitHub release'
+        type: boolean
+        default: false
+
+defaults:
+  run:
+    shell: bash
+
+permissions:
+  contents: read
+
+jobs:
+  vars:
+    name: Set workflow variables
+    runs-on: ubuntu-22.04
+    outputs:
+      github_release: ${{steps.vars.outputs.github_release }}
+      upload_azure: ${{steps.vars.outputs.upload_azure }}
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        with:
+          ref: ${{ inputs.releaseBranch }}
+
+      - name: Set variables
+        id: vars
+        run: |
+          echo "github_release=${{ inputs.uploadGithub }}" >> $GITHUB_OUTPUT
+          echo "upload_azure=${{ inputs.uploadAzure }}" >> $GITHUB_OUTPUT
+          cat $GITHUB_OUTPUT
+
+  upload-release-assets:
+    name: Upload assets
+    runs-on: ubuntu-22.04
+    needs: [vars]
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
+        with:
+          ref: ${{ inputs.releaseBranch }}
+
+      - name: Azure Login
+        if: ${{ inputs.uploadAzure == true }}
+        uses: azure/login@8c334a195cbb38e46038007b304988d888bf676a # v2.0.0
+        with:
+          creds: ${{ secrets.AZURE_CREDENTIALS }}
+
+      - name: Download Packages
+        run:
+          |
+          echo "Checking Packages in ${{inputs.pkgRepo}}/nginx-agent"
+          PKG_REPO=${{inputs.pkgRepo}} CERT=${{secrets.PUBTEST_CERT}} KEY=${{secrets.PUBTEST_KEY}} DL=1 scripts/packages/package-check.sh ${{inputs.pkgVersion}}
+          find ${{inputs.pkgRepo}}/nginx-agent | grep -e "nginx-agent[_-]${{inputs.pkgVersion}}"
+
+      - name: Azure Upload Release Packages
+        if: ${{ inputs.uploadAzure == true }}
+        uses: azure/CLI@965c8d7571d2231a54e321ddd07f7b10317f34d9 # v2.0.0
+        with:
+          inlineScript: |
+            for i in $(find ${{inputs.pkgRepo}}/nginx-agent | grep -e "nginx-agent[_-]${{inputs.pkgVersion}}"); do
+              dest="nginx-agent/${GITHUB_REF##*/}/${i##*/}"
+              if [[ "$i" == *.apk ]]; then
+                ver=$(echo "$i" | grep -o -e "v[0-9]*\.[0-9]*")
+                arch=$(echo "$i" | grep -o -F -e "x86_64" -e "aarch64")
+                dest="nginx-agent/${GITHUB_REF##*/}/nginx-agent-$VER-$ver-$arch.apk"
+              fi
+              echo "Uploading ${i} to ${dest}"
+              az storage blob upload --auth-mode=login -f "$i" -c ${{ secrets.AZURE_CONTAINER_NAME }} \
+              --account-name ${{ secrets.AZURE_ACCOUNT_NAME }} --overwrite -n ${dest}
+            done
+
+      - name: Azure Logout
+        run: |
+          az logout
+        if: always()
+
+      - name: GitHub Upload Release Assets
+        if: ${{ needs.vars.outputs.github_release == 'true' }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        # clobber overwrites existing assets of the same name
+        run: |
+          gh release upload --clobber v${{ inputs.pkgVersion }} \
+            $(find ${{inputs.pkgRepo}}/nginx-agent | grep -e "nginx-agent[_-]${{inputs.pkgVersion}}")

go.mod

@@ -2,7 +2,7 @@ module github.com/nginx/agent/v3
 
 go 1.23.7
 
-toolchain go1.23.8
+toolchain go1.23.10
 
 require (
 	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.4-20250130201111-63bb56e20495.1

internal/file/file_manager_service.go

@@ -68,14 +68,19 @@ type (
 
 	fileManagerServiceInterface interface {
 		UpdateOverview(ctx context.Context, instanceID string, filesToUpdate []*mpi.File, iteration int) error
-		ConfigApply(ctx context.Context, configApplyRequest *mpi.ConfigApplyRequest) (writeStatus model.WriteStatus,
-			err error)
+		ConfigApply(
+			ctx context.Context,
+			configApplyRequest *mpi.ConfigApplyRequest,
+		) (writeStatus model.WriteStatus, err error)
 		Rollback(ctx context.Context, instanceID string) error
 		UpdateFile(ctx context.Context, instanceID string, fileToUpdate *mpi.File) error
 		ClearCache()
 		UpdateCurrentFilesOnDisk(ctx context.Context, updateFiles map[string]*mpi.File, referenced bool) error
-		DetermineFileActions(currentFiles map[string]*mpi.File, modifiedFiles map[string]*model.FileCache) (
-			map[string]*model.FileCache, map[string][]byte, error)
+		DetermineFileActions(
+			ctx context.Context,
+			currentFiles map[string]*mpi.File,
+			modifiedFiles map[string]*model.FileCache,
+		) (map[string]*model.FileCache, map[string][]byte, error)
 		IsConnected() bool
 		SetIsConnected(isConnected bool)
 	}
@@ -505,8 +510,11 @@ func (fms *FileManagerService) ConfigApply(ctx context.Context,
 		return model.Error, allowedErr
 	}
 
-	diffFiles, fileContent, compareErr := fms.DetermineFileActions(fms.currentFilesOnDisk,
-		ConvertToMapOfFileCache(fileOverview.GetFiles()))
+	diffFiles, fileContent, compareErr := fms.DetermineFileActions(
+		ctx,
+		fms.currentFilesOnDisk,
+		ConvertToMapOfFileCache(fileOverview.GetFiles()),
+	)
 
 	if compareErr != nil {
 		return model.Error, compareErr
@@ -541,7 +549,7 @@ func (fms *FileManagerService) ClearCache() {
 
 // nolint:revive,cyclop
 func (fms *FileManagerService) Rollback(ctx context.Context, instanceID string) error {
-	slog.InfoContext(ctx, "Rolling back config for instance", "instanceid", instanceID)
+	slog.InfoContext(ctx, "Rolling back config for instance", "instance_id", instanceID)
 
 	fms.filesMutex.Lock()
 	defer fms.filesMutex.Unlock()
@@ -710,6 +718,7 @@ func (fms *FileManagerService) checkAllowedDirectory(checkFiles []*mpi.File) err
 // that have changed and a map of the contents for each updated and deleted file. Key to both maps is file path
 // nolint: revive,cyclop,gocognit
 func (fms *FileManagerService) DetermineFileActions(
+	ctx context.Context,
 	currentFiles map[string]*mpi.File,
 	modifiedFiles map[string]*model.FileCache,
 ) (
@@ -732,6 +741,7 @@ func (fms *FileManagerService) DetermineFileActions(
 			return nil, nil, manifestFileErr
 		}
 	}
+
 	// if file is in manifestFiles but not in modified files, file has been deleted
 	// copy contents, set file action
 	for fileName, manifestFile := range filesMap {
@@ -741,7 +751,12 @@ func (fms *FileManagerService) DetermineFileActions(
 			// Read file contents before marking it deleted
 			fileContent, readErr := os.ReadFile(fileName)
 			if readErr != nil {
-				return nil, nil, fmt.Errorf("error reading file %s: %w", fileName, readErr)
+				if errors.Is(readErr, os.ErrNotExist) {
+					slog.DebugContext(ctx, "Unable to backup file contents since file does not exist", "file", fileName)
+					continue
+				} else {
+					return nil, nil, fmt.Errorf("error reading file %s: %w", fileName, readErr)
+				}
 			}
 			fileContents[fileName] = fileContent
 

internal/file/file_manager_service_test.go

@@ -559,6 +559,7 @@ func TestFileManagerService_Rollback(t *testing.T) {
 }
 
 func TestFileManagerService_DetermineFileActions(t *testing.T) {
+	ctx := context.Background()
 	tempDir := os.TempDir()
 
 	deleteTestFile := helpers.CreateFileWithErrorCheck(t, tempDir, "nginx_delete.conf")
@@ -584,7 +585,6 @@ func TestFileManagerService_DetermineFileActions(t *testing.T) {
 
 	addTestFile := helpers.CreateFileWithErrorCheck(t, tempDir, "nginx_add.conf")
 	defer helpers.RemoveFileWithErrorCheck(t, addTestFile.Name())
-	t.Logf("Adding file: %s", addTestFile.Name())
 	addFileContent := []byte("test add file")
 	addErr := os.WriteFile(addTestFile.Name(), addFileContent, 0o600)
 	require.NoError(t, addErr)
@@ -694,6 +694,18 @@ func TestFileManagerService_DetermineFileActions(t *testing.T) {
 			expectedContent: make(map[string][]byte),
 			expectedError:   nil,
 		},
+		{
+			name:          "Test 3: File being deleted already doesn't exist",
+			modifiedFiles: make(map[string]*model.FileCache),
+			currentFiles: map[string]*mpi.File{
+				"/unknown/file.conf": {
+					FileMeta: protos.FileMeta("/unknown/file.conf", files.GenerateHash(fileContent)),
+				},
+			},
+			expectedCache:   make(map[string]*model.FileCache),
+			expectedContent: make(map[string][]byte),
+			expectedError:   nil,
+		},
 	}
 
 	for _, test := range tests {
@@ -711,8 +723,11 @@ func TestFileManagerService_DetermineFileActions(t *testing.T) {
 
 			require.NoError(tt, err)
 
-			diff, contents, fileActionErr := fileManagerService.DetermineFileActions(test.currentFiles,
-				test.modifiedFiles)
+			diff, contents, fileActionErr := fileManagerService.DetermineFileActions(
+				ctx,
+				test.currentFiles,
+				test.modifiedFiles,
+			)
 			require.NoError(tt, fileActionErr)
 			assert.Equal(tt, test.expectedContent, contents)
 			assert.Equal(tt, test.expectedCache, diff)