Merge dev into main

Author: DinisCruz

.github/actions/increment-tag-dev/action.yml

@@ -0,0 +1,82 @@
+name       : 'Increment Tag - Dev'
+description: 'Increment Tag - Dev'
+
+inputs:
+  package_name:
+    description: 'Package name for coverage'
+    required: true
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Checkout code
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - name: List all branches
+      shell: bash
+      run: git branch -a
+
+    - name: Checkout dev branch
+      shell: bash
+      run: |
+        git checkout dev || (git checkout -b dev && git push -u origin dev)
+
+
+    - name: Set up Git user
+      shell: bash
+      run: |
+        git config --global user.name 'GitHub Actions'
+        git config --global user.email '[email protected]'
+
+    - name: Fetch all tags
+      shell: bash
+      run: git fetch --tags
+
+    - name: Find and increment latest tag
+      shell: bash
+      id: latest_tag
+      run: |
+        LATEST_TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
+        echo "Latest tag: $LATEST_TAG"
+        
+        # Extract just the version part and increment it
+        VERSION_PART=$(echo $LATEST_TAG | sed 's/^v//')
+        MAJOR=$(echo $VERSION_PART | cut -d. -f1)
+        MINOR=$(echo $VERSION_PART | cut -d. -f2)
+        PATCH=$(echo $VERSION_PART | cut -d. -f3)
+        
+        NEW_PATCH=$((PATCH + 1))
+        
+        NEW_TAG="v$MAJOR.$MINOR.$NEW_PATCH"
+        echo "New tag: $NEW_TAG"
+        
+        echo "NEW_TAG=$NEW_TAG" >> $GITHUB_ENV
+
+    - name: Update README badge
+      shell: bash
+      run: |        
+        sed -i "s/release-v[0-9]*\.[0-9]*\.[0-9]*/release-$NEW_TAG/" README.md
+
+    - name: Update Version File (root)
+      shell: bash
+      run: |
+        echo $NEW_TAG | sed 's/refs\/tags\///' > ./${{ inputs.package_name }}/version
+
+    - name: Commit and push changes
+      shell: bash
+      run: |
+        git add README.md ./${{ inputs.package_name }}/version
+        git commit -m "Update release badge and version file"
+        git push origin dev     # Push to the 'dev' branch
+
+    - name: Tag new version
+      shell: bash
+      run: |
+        NEW_TAG=${{ env.NEW_TAG }}
+        git config --global user.name "GitHub Actions"
+        git config --global user.email "[email protected]"
+        
+        git tag $NEW_TAG
+        git push origin $NEW_TAG

.github/actions/increment-tag-main/action.yml

@@ -0,0 +1,81 @@
+name       : 'Increment Tag - Main'
+description: 'Increment Tag - Main'
+
+inputs:
+  package_name:
+    description: 'Package name for coverage'
+    required: true
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Checkout code
+      uses: actions/checkout@v2  # updated to v2
+      with:
+        ref: 'main'  # Check out the 'main' branch
+        fetch-depth: 0  # Fetch all history for .Git info
+
+    - name: Update Main Branch
+      shell: bash
+      run: |
+        git pull origin main        
+
+    - name: Set up Git user
+      shell: bash
+      run: |
+        git config --global user.name 'GitHub Actions'
+        git config --global user.email '[email protected]'
+
+    - name: Fetch all tags
+      shell: bash
+      run: git fetch --tags
+
+    - name: Find and increment latest tag
+      shell: bash
+      id: latest_tag
+      run: |
+        LATEST_TAG=$(git describe --tags $(git rev-list --tags --max-count=1))
+        echo "Latest tag: $LATEST_TAG"
+        
+        # Extract just the version part and increment it
+        VERSION_PART=$(echo $LATEST_TAG | sed 's/^v//')
+        MAJOR=$(echo $VERSION_PART | cut -d. -f1)
+        Z_PART=$(echo $VERSION_PART | cut -d. -f2)
+        
+        NEW_Z=$((Z_PART + 1))
+        
+        NEW_TAG="v$MAJOR.$NEW_Z.0"
+        echo "New tag: $NEW_TAG"
+        
+        echo "NEW_TAG=$NEW_TAG" >> $GITHUB_ENV
+
+    - name: Update README badge
+      shell: bash
+      run: |        
+        sed -i "s/release-v[0-9]*\.[0-9]*\.[0-9]*/release-$NEW_TAG/" README.md
+
+    - name: Update Version File (root)
+      shell: bash
+      run: |
+        echo $NEW_TAG > ./${{ inputs.package_name }}/version
+
+    - name: Commit and push changes
+      shell: bash
+      run: |
+        git add README.md ./${{ inputs.package_name }}/version
+        git commit -m "Update release badge and version file"
+        git push origin main     # Push to the 'main' branch
+
+    - name: Tag new version
+      shell: bash
+      run: |
+        NEW_TAG=${{ env.NEW_TAG }}
+        git tag $NEW_TAG
+        git push origin $NEW_TAG
+
+    - name: Update Dev branch
+      shell: bash
+      run: |
+        git checkout dev
+        git merge main
+        git push origin dev

.github/actions/install-dependencies__unit/action.yml

@@ -0,0 +1,23 @@
+name       : Install Dependencies (for tests - Unit)
+description: 'Install Dependencies (for tests - Unit)'
+
+runs:
+    using: 'composite'
+    steps:
+      - name: Install Python 3.x
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.x
+      - name: Cache pip dependencies (for tests - Unit)
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/tests/unit/requirements-unit.txt') }}
+          restore-keys: |
+              ${{ runner.os }}-pip-
+      - name: Install dependencies (for tests - Unit)
+        shell: bash
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r tests/unit/requirements-unit.txt
+          pip install -e .

.github/actions/run-tests__unit/action.yml

@@ -0,0 +1,34 @@
+name: Run Python Tests
+description: 'Run Python Tests'
+
+inputs:
+  package_name:
+    description: 'Package name for coverage'
+    required: true
+  AWS_ACCESS_KEY_ID:
+    description: 'AWS Account KEY ID'
+    required: true
+  AWS_SECRET_ACCESS_KEY:
+    description: 'AWS Secret Access Key'
+    required: true
+  AWS_DEFAULT_REGION:
+    description: 'AWS Default region'
+    required: true
+  AWS_ACCOUNT_ID:
+    description: 'AWS Account ID'
+    required: true
+
+
+runs:
+    using: 'composite'
+    steps:
+      - name: Run pytest (with coverage) - Unit Tests
+        shell: bash
+        run: |
+          coverage run --source=${{ inputs.package_name }} -m pytest -v -s --durations=0 --ignore=tests_* tests/unit
+        env:
+          COVERAGE_FILE        : .coverage.unit
+          AWS_SECRET_ACCESS_KEY: ${{ inputs.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION   : ${{ inputs.AWS_DEFAULT_REGION    }}
+          AWS_ACCOUNT_ID       : ${{ inputs.AWS_ACCOUNT_ID        }}
+          AWS_ACCESS_KEY_ID    : ${{ inputs.AWS_ACCESS_KEY_ID     }}

.github/workflows/increment-tag-dev.yml

@@ -0,0 +1,22 @@
+name: Increment Tag - Dev branch
+
+on:
+  workflow_dispatch:
+  workflow_run:
+    workflows: ["Run Unit Tests"]
+    branches: [dev]
+    types:
+      - completed
+
+jobs:
+  increment-tag-dev:
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3 #
+      - name: Increment Tag (for DEV)
+        uses: ./.github/actions/increment-tag-dev
+        with:
+          package_name: ${{ secrets.PACKAGE_NAME          }}
+
+

.github/workflows/increment-tag-main.yml

@@ -0,0 +1,22 @@
+name: Increment Tag - Main branch
+
+on:
+  workflow_dispatch:
+  workflow_run:
+    workflows: ["Run Unit Tests"]
+    branches: [main]
+    types:
+      - completed
+
+jobs:
+  increment-tag-main:
+    if: ${{ github.event.workflow_run.conclusion == 'success' }}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Increment Tag (for MAIN)
+        uses: ./.github/actions/increment-tag-main
+        with:
+          package_name: ${{ secrets.PACKAGE_NAME          }}
+
+

.github/workflows/run-tests.yml

@@ -1,30 +1,34 @@
-name: Run Python Tests
+name       : Run Unit Tests
 on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
+  push
 
 jobs:
-  build:
+  run-tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Install Python 3
-        uses: actions/setup-python@v1
+      # Setup
+      - name: Checkout Code from GitHub
+        uses: actions/checkout@v3
+
+      # Tests - Unit
+      - name: Install Dependencies (for tests - Unit)
+        uses: ./.github/actions/install-dependencies__unit
+
+      - name: Run Tests - Unit
+        #if  : false
+        uses: ./.github/actions/run-tests__unit
         with:
-          python-version: 3.8
-      - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
-          pip install -e .
+          package_name          : ${{ secrets.PACKAGE_NAME          }}
+          AWS_SECRET_ACCESS_KEY : ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION    : ${{ secrets.AWS_DEFAULT_REGION    }}
+          AWS_ACCOUNT_ID        : ${{ secrets.AWS_ACCOUNT_ID        }}
+          AWS_ACCESS_KEY_ID     : ${{ secrets.AWS_ACCESS_KEY_ID     }}
+
+      # Tear Down
+#      - name: Publish Code Coverage
+#        uses: ./.github/actions/publish-coverage
+#        with:
+#          codecov_token         : ${{ secrets.CODECOV_TOKEN         }}
+
+
 
-      - name: Run tests with pytest
-        run: |
-          pytest -v --durations=0 --cov=osbot_utils tests
-          coveralls
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}

git-publish-main.sh

@@ -0,0 +1,7 @@
+git pull
+git checkout main
+git pull origin main
+git merge --no-ff dev -m "Merge dev into main"
+git push origin main
+git checkout dev
+git merge main -m "Merge main into dev"

osbot_aws/AWS_Config.py

@@ -2,7 +2,6 @@
 
 from dotenv import load_dotenv
 
-
 class AWS_Config:
 
     def __init__(self):
@@ -14,15 +13,17 @@ def __enter__(self):
     def __exit__(self, type, value, traceback):
         pass
 
-    def aws_session_profile_name    (self): return os.getenv('AWS_PROFILE_NAME'                                                                 )
-    def aws_session_region_name     (self): return os.getenv('AWS_DEFAULT_REGION'                                                               )
-    def aws_session_account_id      (self): return os.getenv('AWS_ACCOUNT_ID'                                                                   )
-    def dev_skip_aws_key_check      (self): return os.getenv('DEV_SKIP_AWS_KEY_CHECK'        , False                                            )     # use to not have the 500ms check that happens during this check
-    def bot_name                    (self): return os.getenv('OSBOT_NAME'                                                                       )     # todo: refactor variable to osbot_name (need to check for side effects)
-    def lambda_s3_bucket            (self): return os.getenv('OSBOT_LAMBDA_S3_BUCKET'        , f'{self.aws_session_account_id()}-osbot-lambdas' )
-    def lambda_s3_folder_layers     (self): return os.getenv('OSBOT_LAMBDA_S3_FOLDER_LAYERS' , 'layers'                                         )
-    def lambda_s3_folder_lambdas    (self): return os.getenv('OSBOT_LAMBDA_S3_FOLDER_LAMBDAS', 'lambdas'                                        )
-    def lambda_role_name            (self): return os.getenv('OSBOT_LAMBDA_ROLE_NAME'          'role-osbot-lambda'                              )
+    def aws_access_key_id           (self): return os.getenv('AWS_ACCESS_KEY_ID'                                                                  )
+    def aws_secret_access_key       (self): return os.getenv('AWS_SECRET_ACCESS_KEY'                                                              )
+    def aws_session_profile_name    (self): return os.getenv('AWS_PROFILE_NAME'                                                                   )
+    def aws_session_region_name     (self): return os.getenv('AWS_DEFAULT_REGION'                                                                 )
+    def aws_session_account_id      (self): return os.getenv('AWS_ACCOUNT_ID'                ) or  self.sts_session_account_id()
+    def dev_skip_aws_key_check      (self): return os.getenv('DEV_SKIP_AWS_KEY_CHECK'        , False                                              )     # use to not have the 500ms check that happens during this check
+    def bot_name                    (self): return os.getenv('OSBOT_NAME'                                                                         )     # todo: refactor variable to osbot_name (need to check for side effects)
+    def lambda_s3_bucket            (self): return os.getenv('OSBOT_LAMBDA_S3_BUCKET'        ) or f'{self.aws_session_account_id()}-osbot-lambdas'
+    def lambda_s3_folder_layers     (self): return os.getenv('OSBOT_LAMBDA_S3_FOLDER_LAYERS' , 'layers'                                           )
+    def lambda_s3_folder_lambdas    (self): return os.getenv('OSBOT_LAMBDA_S3_FOLDER_LAMBDAS', 'lambdas'                                          )
+    def lambda_role_name            (self): return os.getenv('OSBOT_LAMBDA_ROLE_NAME'          'role-osbot-lambda'                                )
 
 
     def set_aws_session_profile_name(self, value): os.environ['AWS_PROFILE_NAME'                ] = value ; return value
@@ -34,6 +35,14 @@ def set_lambda_s3_folder_lambdas(self, value): os.environ['OSBOT_LAMBDA_S3_FOLDE
     def set_lambda_role_name        (self, value): os.environ['OSBOT_LAMBDA_ROLE_NAME'          ] = value ; return value
     def set_bot_name                (self, value): os.environ['OSBOT_NAME'                      ] = value ; return value
 
+    def sts_session_account_id(self):                   # to handle when the AWS_ACCOUNT_ID is not set
+        from osbot_aws.apis.STS import STS              #   the use of this method is not advised
+        return STS().current_account_id()               #   since this is quite an expensive method
+
+    # helper methods
+    def account_id (self): return self.aws_session_account_id()
+    def region_name(self): return self.aws_session_region_name()
+
 
 def set_aws_region(region_name):
     AWS_Config().set_aws_session_region_name(region_name)