Merge branch 'main' into clickup-integrations

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,9 @@
 # Description
 
 What -
+
 Why -
+
 How -
 
 ## Type of change
@@ -15,6 +17,39 @@ Please leave one option from the following and delete the rest:
 - [ ] Non-breaking change (fix of existing functionality that will not change current behavior)
 - [ ] Documentation (added/updated documentation)
 
+<h4> All tests should be run against the port production environment(using a testing org). </h4>
+
+### Core testing checklist
+
+- [ ] Integration able to create all default resources from scratch
+- [ ] Resync finishes successfully
+- [ ] Resync able to create entities
+- [ ] Resync able to update entities
+- [ ] Resync able to detect and delete entities
+- [ ] Scheduled resync able to abort existing resync and start a new one
+- [ ] Tested with at least 2 integrations from scratch
+- [ ] Tested with Kafka and Polling event listeners
+
+
+### Integration testing checklist
+
+- [ ] Integration able to create all default resources from scratch
+- [ ] Resync able to create entities
+- [ ] Resync able to update entities
+- [ ] Resync able to detect and delete entities
+- [ ] Resync finishes successfully
+- [ ] If new resource kind is added or updated in the integration, add example raw data, mapping and expected result to the `examples` folder in the integration directory. 
+- [ ] If resource kind is updated, run the integration with the example data and check if the expected result is achieved
+- [ ] If new resource kind is added or updated, validate that live-events for that resource are working as expected
+- [ ] Docs PR link [here](#)
+
+### Preflight checklist
+
+- [ ] Handled rate limiting
+- [ ] Handled pagination
+- [ ] Implemented the code in async
+- [ ] Support Multi account
+
 ## Screenshots
 
 Include screenshots from your environment showing how the resources of the integration will look.

CHANGELOG.md

@@ -7,6 +7,34 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 <!-- towncrier release notes start -->
 
+## 0.10.4 (2024-08-28)
+
+### Bug Fixes
+
+- Fixed upsert entity failure when saving modified data for search relations calculations
+
+
+## 0.10.3 (2024-08-28)
+
+### Bug Fixes
+
+- Bugfix Semaphores get fail when moving to the next scheduled resync when syncing a large number of entities, using a single event loop for all threads
+
+
+## 0.10.2 (2024-08-26)
+
+### Bug Fixes
+
+- Reverted last bugfix
+
+
+## 0.10.1 (2024-08-26)
+
+### Bug Fixes
+
+- Fixed unhashable type: 'dict' error when trying to delete entities with search identifier/relations
+
+
 ## 0.10.0 (2024-08-19)
 
 ### Improvements
@@ -17,7 +45,6 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## 0.9.14 (2024-08-19)
 
-
 ### Bug Fixes
 
 - Fixed an issue causing the cli to fail in a directory with no pyproject.toml in it
@@ -128,7 +155,7 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ### Bug Fixes
 
-- Safely get changelogDestination key instead of accessing it directly 
+- Safely get changelogDestination key instead of accessing it directly
 
 
 ## 0.9.0 (2024-06-19)
@@ -589,7 +616,7 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 - Fixed kafka consumer to poll messages asynchronously, to avoid max poll timeout when running long resyncs (PORT-5160)
 - Fixed a bug where the expiration of a Port token is not properly handled (PORT-5161)
-- Fixed a bug where the `retry_every` didn't count failed runs as repetitions (PORT-5161) 
+- Fixed a bug where the `retry_every` didn't count failed runs as repetitions (PORT-5161)
 
 ## 0.4.2 (2023-11-04)
 
@@ -619,7 +646,7 @@ this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 - Fixed the `initialize-port-resources` option in `ocean sail` to not be a flag.
 - Changed default of `initialize-port-resources` to `true`.
-- Catch all exceptions in the resync of ONCE event listener,to make sure the application will exit gracefully 
+- Catch all exceptions in the resync of ONCE event listener,to make sure the application will exit gracefully
 
 
 ## 0.4.0 (2023-10-31)

Makefile

@@ -5,7 +5,7 @@ define run_checks
 	cd $1; \
 	poetry check || exit_code=$$?;\
 	mypy . --exclude '/\.venv/' || exit_code=$$?; \
-	ruff . || exit_code=$$?; \
+	ruff check . || exit_code=$$?; \
 	black --check . || exit_code=$$?; \
 	yamllint . || exit_code=$$?; \
 	if [ $$exit_code -eq 1 ]; then \
@@ -55,6 +55,7 @@ install:
 	$(call install_precommit)
 
 test/all: test
+	$(ACTIVATE) && \
 	pytest --import-mode=importlib -n auto ./port_ocean/tests ./integrations/*/tests
 
 install/all: install

integrations/argocd/CHANGELOG.md

@@ -7,6 +7,38 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- towncrier release notes start -->
 
+## 0.1.81 (2024-08-28)
+
+
+### Improvements
+
+- Bumped ocean version to ^0.10.4 (#1)
+
+
+## 0.1.80 (2024-08-28)
+
+
+### Improvements
+
+- Bumped ocean version to ^0.10.3 (#1)
+
+
+## 0.1.79 (2024-08-26)
+
+
+### Improvements
+
+- Bumped ocean version to ^0.10.2 (#1)
+
+
+## 0.1.78 (2024-08-26)
+
+
+### Improvements
+
+- Bumped ocean version to ^0.10.1 (#1)
+
+
 ## 0.1.77 (2024-08-22)
 
 

integrations/argocd/pyproject.toml

@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "argocd"
-version = "0.1.77"
+version = "0.1.81"
 description = "Argo CD integration powered by Ocean"
 authors = ["Isaac Coffie <[email protected]>"]
 
 [tool.poetry.dependencies]
 python = "^3.11"
-port_ocean = {version = "^0.10.0", extras = ["cli"]}
+port_ocean = {version = "^0.10.4", extras = ["cli"]}
 
 [tool.poetry.group.dev.dependencies]
 # Uncomment this if you want to debug the ocean core together with your integration

integrations/aws/CHANGELOG.md

@@ -7,6 +7,46 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- towncrier release notes start -->
 
+## 0.2.34 (2024-08-28)
+
+
+### Improvements
+
+- Bumped ocean version to ^0.10.4 (#1)
+
+
+## 0.2.33 (2024-08-28)
+
+
+### Improvements
+
+- Bumped ocean version to ^0.10.3 (#1)
+
+
+## 0.2.32 (2024-08-28)
+
+
+### Improvements
+
+- Fix typo in integrations/aws/integration.py
+
+
+## 0.2.31 (2024-08-26)
+
+
+### Improvements
+
+- Bumped ocean version to ^0.10.2 (#1)
+
+
+## 0.2.30 (2024-08-26)
+
+
+### Improvements
+
+- Bumped ocean version to ^0.10.1 (#1)
+
+
 ## 0.2.29 (2024-08-22)
 
 

integrations/aws/integration.py

@@ -4,6 +4,6 @@
 from utils.overrides import AWSPortAppConfig
 
 
-class AzureIntegration(BaseIntegration):
+class AWSIntegration(BaseIntegration):
     class AppConfigHandlerClass(APIPortAppConfig):
         CONFIG_CLASS = AWSPortAppConfig

integrations/aws/pyproject.toml

@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "aws"
-version = "0.2.29"
+version = "0.2.34"
 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.0", extras = ["cli"]}
+port_ocean = {version = "^0.10.4", 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"]}

integrations/azure-devops/CHANGELOG.md

@@ -7,6 +7,38 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- towncrier release notes start -->
 
+## 0.1.59 (2024-08-28)
+
+
+### Improvements
+
+- Bumped ocean version to ^0.10.4 (#1)
+
+
+## 0.1.58 (2024-08-28)
+
+
+### Improvements
+
+- Bumped ocean version to ^0.10.3 (#1)
+
+
+## 0.1.57 (2024-08-26)
+
+
+### Improvements
+
+- Bumped ocean version to ^0.10.2 (#1)
+
+
+## 0.1.56 (2024-08-26)
+
+
+### Improvements
+
+- Bumped ocean version to ^0.10.1 (#1)
+
+
 ## 0.1.55 (2024-08-22)
 
 

integrations/azure-devops/pyproject.toml

@@ -1,12 +1,12 @@
 [tool.poetry]
 name = "azure-devops"
-version = "0.1.55"
+version = "0.1.59"
 description = "An Azure Devops Ocean integration"
 authors = ["Matan Geva <[email protected]>"]
 
 [tool.poetry.dependencies]
 python = "^3.11"
-port_ocean = {version = "^0.10.0", extras = ["cli"]}
+port_ocean = {version = "^0.10.4", extras = ["cli"]}
 
 [tool.poetry.group.dev.dependencies]
 # Uncomment this if you want to debug the ocean core together with your integration