Merge branch '3.0' into fasttrack/3.0

Author: jslobodzian

.github/workflows/check-files.yml

@@ -0,0 +1,140 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+name: Check Disallowed Files
+
+on:
+  push:
+    branches: [main, 2.0*, 3.0*, fasttrack/*]
+  pull_request:
+    branches: [main, 2.0*, 3.0*, fasttrack/*]
+
+jobs:
+
+  build:
+    name: Check Disallowed Files
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Check out code
+      uses: actions/checkout@v4
+
+    - name: Get base commit for PRs
+      if: ${{ github.event_name == 'pull_request' }}
+      run: |
+        git fetch origin ${{ github.base_ref }}
+        echo "base_sha=$(git rev-parse origin/${{ github.base_ref }})" >> $GITHUB_ENV
+        echo "Merging ${{ github.sha }} into ${{ github.base_ref }}"
+
+    - name: Get base commit for Pushes
+      if: ${{ github.event_name == 'push' }}
+      run: |
+        git fetch origin ${{ github.event.before }}
+        echo "base_sha=${{ github.event.before }}" >> $GITHUB_ENV
+        echo "Merging ${{ github.sha }} into ${{ github.event.before }}"
+
+    - name: Get the changed files
+      run: |
+        echo "Files changed: '$(git diff-tree --no-commit-id --name-only -r ${{ env.base_sha }} ${{ github.sha }})'"
+        changed_files=$(git diff-tree --diff-filter=AM --no-commit-id --name-only -r ${{ env.base_sha }} ${{ github.sha }})
+        echo "Files to validate: '${changed_files}'"
+        echo "changed-files<<EOF" >> $GITHUB_ENV
+        echo "${changed_files}" >> $GITHUB_ENV
+        echo "EOF" >> $GITHUB_ENV
+
+    - name: Check for disallowed file types
+      run: |
+        if [[ -z "${{ env.changed-files }}" ]]; then
+          echo "No files to validate. Exiting."
+          exit 0
+        fi
+
+        echo "Checking files..."
+        error_found=0
+
+        # Read disallowed extensions from the configuration file
+        if [[ ! -f ".github/workflows/disallowed-extensions.txt" ]]; then
+          echo "Configuration file '.github/workflows/disallowed-extensions.txt' not found. Skipping check."
+          exit 0
+        fi
+
+        # Create array of disallowed extensions
+        mapfile -t disallowed_extensions < .github/workflows/disallowed-extensions.txt
+        if [[ $? -ne 0 ]]; then
+          echo "Error occurred while reading disallowed extensions. Exiting."
+          exit 1
+        fi
+        
+        # Check each changed file
+        while IFS= read -r file; do
+          if [[ -z "$file" ]]; then
+            continue
+          fi
+
+          echo "Checking file: $file"
+          
+          # Get file extension (convert to lowercase for comparison)
+          extension=$(echo "${file##*.}" | tr '[:upper:]' '[:lower:]')
+          filename=$(basename "$file")
+          
+          # Check if file should be in blob store
+          should_be_in_blob_store=false
+          
+          # Check against disallowed extensions
+          for disallowed_ext in "${disallowed_extensions[@]}"; do
+            # Remove any whitespace and comments
+            clean_ext=$(echo "$disallowed_ext" | sed 's/#.*//' | xargs)
+            if [[ -z "$clean_ext" ]]; then
+              continue
+            fi
+            
+            if [[ "$extension" == "$clean_ext" ]]; then
+              should_be_in_blob_store=true
+              break
+            fi
+          done
+          
+          # Additional checks for binary files and large files
+          if [[ -f "$file" ]]; then
+            # Check if file is binary (but allow .sh files even if executable)
+            if [[ "$extension" != "sh" ]] && file "$file" | grep -q "binary\|executable\|archive\|compressed"; then
+              should_be_in_blob_store=true
+            fi
+            
+            # Check file size (files > 1MB should be in blob store)
+            file_size=$(stat -f%z "$file" 2>/dev/null || stat -c%s "$file" 2>/dev/null || echo 0)
+            if [[ $file_size -gt 1048576 ]]; then  # 1MB
+              should_be_in_blob_store=true
+            fi
+          fi
+          
+          if [[ "$should_be_in_blob_store" == "true" ]]; then
+            1>&2 echo "**** ERROR ****"
+            1>&2 echo "File '$file' should be stored in blob store, not in git repository."
+            1>&2 echo "Reason: Images, Large files, binaries, tarballs, and non-text files slow down git operations"
+            1>&2 echo "and cannot be efficiently diffed. Please upload to blob store instead."
+            1>&2 echo "**** ERROR ****"
+            error_found=1
+          fi
+        done <<< "${{ env.changed-files }}"
+
+        if [[ $error_found -eq 1 ]]; then
+          echo ""
+          echo "=========================================="
+          echo "FILES THAT SHOULD BE IN BLOB STORE DETECTED"
+          echo "=========================================="
+          echo "The following file types should be stored in blob store:"
+          echo "- Source tarballs (.tar.gz, .tar.xz, .zip, etc.)"
+          echo "- Binary files (.bin, .exe, .so, .dll, etc.)"
+          echo "- Images (.gif, .bmp, etc.)"
+          echo "- Archives (.rar, .7z, .tar, etc.)"
+          echo "- Large files (> 1MB)"
+          echo "- Any non-text files that cannot be efficiently diffed"
+          echo ""
+          echo "Please upload these files to the blob store and reference them"
+          echo "in your spec files or configuration instead of checking them into git."
+          echo "=========================================="
+          exit 1
+        fi
+
+        echo "All files are appropriate for git storage."

.github/workflows/disallowed-extensions.txt

@@ -0,0 +1,79 @@
+# File extensions that should be stored in blob store instead of git repository
+# Lines starting with # are comments and will be ignored
+# Extensions should be lowercase without the leading dot
+
+# Source tarballs and archives
+tar
+gz
+tgz
+bz2
+xz
+zip
+rar
+7z
+tar.gz
+tar.xz
+tar.bz2
+
+# Binary executables
+bin
+exe
+dll
+so
+dylib
+a
+lib
+obj
+o
+
+# Image files
+gif
+bmp
+tiff
+tif
+webp
+raw
+heif
+
+
+# Audio/Video files
+mp3
+wav
+avi
+mp4
+mkv
+mov
+wmv
+flv
+ogg
+m4a
+aac
+
+# Package files
+rpm
+deb
+msi
+dmg
+iso
+
+# Compressed source packages
+gem
+whl
+egg
+
+# Database files
+db
+sqlite
+sqlite3
+
+# Fonts
+ttf
+otf
+woff
+woff2
+
+# Other binary formats
+jar
+war
+ear
+class

.github/workflows/go-test-coverage.yml

@@ -10,7 +10,7 @@ on:
     branches: [main, dev, 1.0*, 2.0*, 3.0*, fasttrack/*]
 
 env:
-  EXPECTED_GO_VERSION: "1.21"
+  EXPECTED_GO_VERSION: "1.23"
 
 jobs:
   build:

.pipelines/containerSourceData/scripts/PublishContainers.sh

@@ -92,11 +92,52 @@ function acr_login {
 # $1: image name
 function oras_attach {
     local image_name=$1
+    local max_retries=3
+    local retry_count=0
+
+    while [ $retry_count -lt $max_retries ]; do
+        echo "+++ Attempting to attach lifecycle annotation to $image_name (attempt $((retry_count + 1))/$max_retries)"
+        
+        if oras attach \
+            --artifact-type "application/vnd.microsoft.artifact.lifecycle" \
+            --annotation "vnd.microsoft.artifact.lifecycle.end-of-life.date=$END_OF_LIFE_1_YEAR" \
+            "$image_name"; then
+            echo "+++ Successfully attached lifecycle annotation to $image_name"
+            return 0
+        else
+            retry_count=$((retry_count + 1))
+            if [ $retry_count -lt $max_retries ]; then
+                echo "+++ Failed to attach lifecycle annotation to $image_name. Retrying in 5 seconds..."
+                sleep 5
+            else
+                echo "+++ Failed to attach lifecycle annotation to $image_name after $max_retries attempts"
+                return 1
+            fi
+        fi
+    done
+}
+
+# Detach the end-of-life annotation from the container image.
+# $1: image name
+function oras_detach {
+    local image_name=$1
+    lifecycle_manifests=$(oras discover -o json  --artifact-type "application/vnd.microsoft.artifact.lifecycle" "$image_name")
+    manifests=$(echo "$lifecycle_manifests" | jq -r '.manifests')
+
+    if [[ -z $manifests ]]; then
+        echo "+++ No lifecycle manifests found for $image_name"
+        return
+    fi
 
-    oras attach \
-        --artifact-type "application/vnd.microsoft.artifact.lifecycle" \
-        --annotation "vnd.microsoft.artifact.lifecycle.end-of-life.date=$END_OF_LIFE_1_YEAR" \
-        "$image_name"
+    echo "+++ Found lifecycle manifests for $image_name: $manifests"
+    # Loop through the manifests and delete them.
+    manifest_count=$(echo "$manifests" | jq length)
+    for (( i=0; i<manifest_count; i++ )); do
+        digest=$(echo "$lifecycle_manifests" | jq -r ".manifests[$i].digest")
+        echo "Deleting manifest with digest: $digest"
+        imageNameWithoutTag=${image_name%:*}
+        oras manifest delete --force "$imageNameWithoutTag@$digest"
+    done
 }
 
 function create_multi_arch_tags {
@@ -191,6 +232,7 @@ function create_multi_arch_tags {
     echo "+++ push $full_multiarch_tag tag"
     docker manifest push "$full_multiarch_tag"
     echo "+++ $full_multiarch_tag tag pushed successfully"
+    oras_detach "$full_multiarch_tag"
     oras_attach "$full_multiarch_tag"
 
     # Save the multi-arch tag to a file.
@@ -281,6 +323,7 @@ do
             docker image tag "$amd64_image" "$amd64_retagged_image_name"
             docker rmi "$amd64_image"
             docker image push "$amd64_retagged_image_name"
+            oras_detach "$amd64_retagged_image_name"
             oras_attach "$amd64_retagged_image_name"
 
             if [[ $ARCHITECTURE_TO_BUILD == *"ARM64"*  ]]; then
@@ -289,6 +332,7 @@ do
                 docker image tag "$arm64_image" "$arm64_retagged_image_name"
                 docker rmi "$arm64_image"
                 docker image push "$arm64_retagged_image_name"
+                oras_detach "$arm64_retagged_image_name"
                 oras_attach "$arm64_retagged_image_name"
             fi
 

LICENSES-AND-NOTICES/SPECS/LICENSES-MAP.md

@@ -2000,7 +2000,7 @@
                 "scotch",
                 "screen",
                 "scrub",
-                "SDL",
+                "sdl12-compat",
                 "SDL2",
                 "SDL_sound",
                 "sdparm",

LICENSES-AND-NOTICES/SPECS/data/licenses.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "PyGreSQL-5.2.2.tar.gz": "8c6c56f95cf08337075be0930a1d28333624ebcd6180cf888c59d3e2887f32ce"
+  "PyGreSQL-6.0.1.tar.gz": "57e44af29c7443641ca65e549e568848946f937597cf19064bbfadc4e5e53bfb"
  }
 }

SPECS-EXTENDED/PyGreSQL/PyGreSQL.signatures.json

@@ -1,16 +1,18 @@
+%global with_tests 0
+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 %global srcname	PyGreSQL
 
 Name:		%{srcname}
-Version:	5.2.2
-Release:	3%{?dist}
+Version:	6.0.1
+Release:	1%{?dist}
 Summary:	Python client library for PostgreSQL
 
 URL:		http://www.pygresql.org/
 License:	PostgreSQL
 
-Source0:	https://github.com/PyGreSQL/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
+Source0:	https://github.com/PyGreSQL/%{name}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 
 BuildRequires:  gcc
 BuildRequires:	libpq-devel
@@ -58,12 +60,18 @@ find -type f -exec chmod 644 {} +
 %files -n python3-pygresql
 %license docs/copyright.rst
 %doc docs/*.rst
-%{python3_sitearch}/*.so
-%{python3_sitearch}/*.py
-%{python3_sitearch}/__pycache__/*.py{c,o}
+%{python3_sitearch}/pg/*.so
+%{python3_sitearch}/pg/*.py
+%{python3_sitearch}//pg/__pycache__/*.py{c,o}
+%{python3_sitearch}/pg/_pg.pyi
+%{python3_sitearch}/pg/py.typed
+%{python3_sitearch}/pgdb/*.py
+%{python3_sitearch}/pgdb/__pycache__/*.py{c,o}
+%{python3_sitearch}/pgdb/py.typed
 %{python3_sitearch}/*.egg-info
 
-
+# Requires postgresql-test-rpm-macros which is not provided by postgresql in Azure Linux.
+%if 0%{?with_tests}
 %check
 %postgresql_tests_run
 
@@ -76,9 +84,12 @@ dbport = $PGPORT
 EOF
 
 %{__python3} setup.py test
-
+%endif
 
 %changelog
+* Wed Sep 25 2024 jyoti kanase <[email protected]> - 6.0.1-1
+- Update to 6.0.1
+
 * Thu Aug 31 2023 Pawel Winogrodzki <[email protected]> - 5.2.2-3
 - Disabling missing test dependency.
 - License verified.