Merge branch 'main' into gitlab-test

port-labs · Sep 20, 2024 · 0ad4a3b · 0ad4a3b
2 parents eb9a1a4 + 339d284
commit 0ad4a3b
Show file tree

Hide file tree

Showing 134 changed files with 2,369 additions and 833 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,12 +28,37 @@ jobs:
         working-directory: ${{ matrix.folder != '.' && format('integrations/{0}', matrix.folder) || '.' }}
         run: |
           make install
-      - name: Test
-        working-directory: ${{ matrix.folder != '.' && format('integrations/{0}', matrix.folder) || '.' }}
-        env:
-          PYTEST_ADDOPTS: --junitxml=junit/test-results-${{ matrix.folder != '.' && format('integrations/{0}', matrix.folder) || 'ocean/core' }}.xml
-        run: |
-          make test
+
+      # # Core only actions
+      # - name: Build core for smoke test
+      #   if: ${{ matrix.folder == '.' }}
+      #   working-directory: ${{ matrix.folder != '.' && format('integrations/{0}', matrix.folder) || '.' }}
+      #   run: |
+      #     make build
+
+      # - name: Run fake integration for core test
+      #   working-directory: ${{ matrix.folder != '.' && format('integrations/{0}', matrix.folder) || '.' }}
+      #   if: ${{ matrix.folder == '.' }}
+      #   env:
+      #     PORT_CLIENT_ID: ${{ secrets.PORT_CLIENT_ID }}
+      #     PORT_CLIENT_SECRET: ${{ secrets.PORT_CLIENT_SECRET }}
+      #     PORT_BASE_URL: ${{ secrets.PORT_BASE_URL }}
+      #     SMOKE_TEST_SUFFIX: ${{ github.run_id }}
+      #   run: |
+      #     ./scripts/run-smoke-test.sh
+
+      # - name: Test Core
+      #   if: ${{ matrix.folder == '.' }}
+      #   working-directory: ${{ matrix.folder != '.' && format('integrations/{0}', matrix.folder) || '.' }}
+      #   env:
+      #     PYTEST_ADDOPTS: --junitxml=junit/test-results-${{ matrix.folder != '.' && format('integrations/{0}', matrix.folder) || 'ocean/core' }}.xml
+      #     PORT_CLIENT_ID: ${{ secrets.PORT_CLIENT_ID }}
+      #     PORT_CLIENT_SECRET: ${{ secrets.PORT_CLIENT_SECRET }}
+      #     PORT_BASE_URL: ${{ secrets.PORT_BASE_URL }}
+      #     SMOKE_TEST_SUFFIX: ${{ github.run_id }}
+      #   run: |
+      #     make test
+
       - name: Install current core for all integrations
         working-directory: ${{ matrix.folder != '.' && format('integrations/{0}', matrix.folder) || '.' }}
         if: ${{ matrix.folder == '.' }}
@@ -46,10 +71,22 @@ jobs:
         run: |
           echo "Testing all integrations with local core"
           SCRIPT_TO_RUN="PYTEST_ADDOPTS=--junitxml=${PWD}/junit/test-results-core-change/\`pwd | xargs basename\`.xml make test" make execute/all
+
+      # Integration step
+      - name: Test
+        # if: ${{ matrix.folder != '.' }}
+        working-directory: ${{ matrix.folder != '.' && format('integrations/{0}', matrix.folder) || '.' }}
+        env:
+          PYTEST_ADDOPTS: --junitxml=junit/test-results-${{ matrix.folder != '.' && format('integrations/{0}', matrix.folder) || 'ocean/core' }}.xml
+        run: |
+          make test
+
+      # Generic
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v4
         if: ${{ always() }}
         with:
           report_paths: '**/junit/test-results-**/*.xml'
           include_passed: true
           require_tests: true
+          fail_on_failure: true
diff --git a/.gitignore b/.gitignore
@@ -159,3 +159,8 @@ cython_debug/
 # VSCode
 .vscode/*
 !.vscode/launch.json
+
+# Junit
+
+junit/*
+**/junit/*
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -13,10 +13,10 @@ repos:
       - id: detect-aws-credentials
   - repo: local
     hooks:
-      - id: lint
-        name: Run linter
-        description: This hooks runs our linters
-        entry: make lint
+      - id: fix lint
+        name: Fix linter
+        description: This hooks fixes our linters
+        entry: make lint/fix
         language: system
         types:
           - python
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,23 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 <!-- towncrier release notes start -->
 
+## 0.10.11 (2024-09-17)
+
+### Improvements
+
+- Add smoke test with a live integration to validate core changes
+
+## 0.10.10 (2024-09-12)
+
+### Bug Fixes
+
+- Fixed failing on initialization of the integration when one of the actions exists in port
+
+### Improvements
+
+- Added fix lint command to the makefile as well as the pre-commit hook
+
+
 ## 0.10.9 (2024-09-05)
 
 ### Bug Fixes

diff --git a/Makefile b/Makefile
@@ -42,6 +42,8 @@ define deactivate_virtualenv
     fi
 endef
 
+.SILENT: install install/all test/all lint lint/fix build run new test test/watch clean bump/integrations bump/single-integration execute/all
+
 # Install dependencies
 install:
 	$(call deactivate_virtualenv) && \
@@ -94,6 +96,11 @@ lint:
 	$(ACTIVATE) && \
 	$(call run_checks,.)
 
+lint/fix:
+	$(ACTIVATE) && \
+	black .
+	ruff check --fix .
+
 # Development commands
 build:
 	$(ACTIVATE) && poetry build

diff --git a/integrations/_infra/Dockerfile b/integrations/_infra/Dockerfile
@@ -4,6 +4,8 @@ ARG BUILD_CONTEXT
 ARG INTEGRATION_VERSION
 
 LABEL INTEGRATION_VERSION=${INTEGRATION_VERSION}
+# Used to ensure that new integrations will be public, see https://docs.github.com/en/packages/learn-github-packages/configuring-a-packages-access-control-and-visibility
+LABEL org.opencontainers.image.source https://github.com/port-labs/ocean
 
 ENV LIBRDKAFKA_VERSION 1.9.2
 

diff --git a/integrations/_infra/Makefile b/integrations/_infra/Makefile
@@ -37,7 +37,7 @@ define deactivate_virtualenv
     fi
 endef
 
-.SILENT: install install/prod install/local-core lint run test clean
+.SILENT: install install/prod install/local-core lint lint/fix run test clean
 
 install:
 	$(call deactivate_virtualenv) && \
@@ -56,6 +56,11 @@ lint:
 	$(ACTIVATE) && \
 	$(call run_checks,.)
 
+lint/fix:
+	$(ACTIVATE) && \
+	black .
+	ruff check --fix .
+
 run:
 	$(ACTIVATE) && ocean sail
 

diff --git a/integrations/argocd/CHANGELOG.md b/integrations/argocd/CHANGELOG.md
@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- towncrier release notes start -->
 
+## 0.1.87 (2024-09-17)
+
+
+### Improvements
+
+- Bumped ocean version to ^0.10.11
+
+
+## 0.1.86 (2024-09-12)
+
+
+### Improvements
+
+- Bumped ocean version to ^0.10.10 (#1)
+
+
 ## 0.1.85 (2024-09-05)
 
 

diff --git a/integrations/argocd/poetry.lock b/integrations/argocd/poetry.lock
diff --git a/integrations/argocd/pyproject.toml b/integrations/argocd/pyproject.toml
@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "argocd"
-version = "0.1.85"
+version = "0.1.87"
 description = "Argo CD integration powered by Ocean"
 authors = ["Isaac Coffie <[email protected]>"]
 
 [tool.poetry.dependencies]
 python = "^3.11"
-port_ocean = {version = "^0.10.9", extras = ["cli"]}
+port_ocean = {version = "^0.10.11", extras = ["cli"]}
 
 [tool.poetry.group.dev.dependencies]
 # Uncomment this if you want to debug the ocean core together with your integration

diff --git a/integrations/aws/CHANGELOG.md b/integrations/aws/CHANGELOG.md
@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- towncrier release notes start -->
 
+## 0.2.40 (2024-09-17)
+
+
+### Improvements
+
+- Bumped ocean version to ^0.10.11
+
+
+## 0.2.39 (2024-09-12)
+
+
+### Improvements
+
+- Bumped ocean version to ^0.10.10 (#1)
+
+
 ## 0.2.38 (2024-09-05)
 
 

diff --git a/integrations/aws/poetry.lock b/integrations/aws/poetry.lock
diff --git a/integrations/aws/pyproject.toml b/integrations/aws/pyproject.toml
@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "aws"
-version = "0.2.38"
+version = "0.2.40"
 description = "This integration will map all your resources in all the available accounts to your Port entities"
 authors = ["Shalev Avhar <[email protected]>", "Erik Zaadi <[email protected]>"]
 
 [tool.poetry.dependencies]
 python = "^3.11"
-port_ocean = {version = "^0.10.9", extras = ["cli"]}
+port_ocean = {version = "^0.10.11", extras = ["cli"]}
 python-dotenv = "^1.0.1"
 aioboto3 = "^12.4.0"
 boto3-stubs = {version = "1.34.76", extras = ["acm", "apigateway", "appconfig", "athena", "cloudcontrol", "cloudformation", "cloudwatch", "dynamodb", "ec2", "ec2-instance-connect", "ecr", "ecs", "elasticache", "elb", "elbv2", "events", "iam", "lambda", "logs", "organizations", "rds", "route53", "s3", "sagemaker", "secretsmanager", "sns", "sqs", "ssm", "sts"]}

diff --git a/integrations/azure-devops/CHANGELOG.md b/integrations/azure-devops/CHANGELOG.md
@@ -7,6 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- towncrier release notes start -->
 
+## 0.1.68 (2024-09-17)
+
+
+### Improvements
+
+- Bumped ocean version to ^0.10.11
+
+
+## 0.1.67 (2024-09-12)
+
+
+### Improvements
+
+- Bumped ocean version to ^0.10.10 (#1)
+
+
 ## 0.1.66 (2024-09-06)
 
 

diff --git a/integrations/azure-devops/poetry.lock b/integrations/azure-devops/poetry.lock
diff --git a/integrations/azure-devops/pyproject.toml b/integrations/azure-devops/pyproject.toml
@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "azure-devops"
-version = "0.1.66"
+version = "0.1.68"
 description = "An Azure Devops Ocean integration"
 authors = ["Matan Geva <[email protected]>"]
 
 [tool.poetry.dependencies]
 python = "^3.11"
-port_ocean = {version = "^0.10.9", extras = ["cli"]}
+port_ocean = {version = "^0.10.11", extras = ["cli"]}
 
 [tool.poetry.group.dev.dependencies]
 # Uncomment this if you want to debug the ocean core together with your integration

diff --git a/integrations/azure/CHANGELOG.md b/integrations/azure/CHANGELOG.md
@@ -1,3 +1,17 @@
+0.1.91 (2024-09-17)
+
+### Improvements
+
+- Bumped ocean version to ^0.10.11
+
+
+0.1.90 (2024-09-12)
+
+### Improvements
+
+- Bumped ocean version to ^0.10.10 (#1)
+
+
 0.1.89 (2024-09-05)
 
 ### Improvements

diff --git a/integrations/azure/poetry.lock b/integrations/azure/poetry.lock