Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Integration][Octopus] Added integration with support for Spaces Project, Release, Deployments and Machines #880

Merged
merged 51 commits into from
Aug 24, 2024
Merged
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
dc18040
Added Octopus integration with support for Project, Release, Deployme…
oiadebayo Aug 2, 2024
f13853c
Merge branch 'main' into PORT-9398-Add-an-Octopus-Deploy-Ocean-integr…
oiadebayo Aug 2, 2024
9b47c73
Updated ocean version
oiadebayo Aug 2, 2024
25597b7
Merge branch 'PORT-9398-Add-an-Octopus-Deploy-Ocean-integration' of g…
oiadebayo Aug 2, 2024
17ec1d9
Updated ocean version
oiadebayo Aug 2, 2024
205befe
Lint
oiadebayo Aug 2, 2024
1b47912
Lint
oiadebayo Aug 2, 2024
4e59537
Lint
oiadebayo Aug 2, 2024
85d2510
Removed unnecessary logging
oiadebayo Aug 2, 2024
0b81075
Merge branch 'main' into PORT-9398-Add-an-Octopus-Deploy-Ocean-integr…
oiadebayo Aug 4, 2024
2590472
Attended to suggestion in comments
oiadebayo Aug 6, 2024
a667fd7
Merge branch 'main' into PORT-9398-Add-an-Octopus-Deploy-Ocean-integr…
oiadebayo Aug 6, 2024
8402ef7
Attended to new review comments
oiadebayo Aug 7, 2024
7b695f7
Made server url load from env
oiadebayo Aug 7, 2024
89bc9c4
Attended to suggestion in comments
oiadebayo Aug 8, 2024
780378a
Removed unnecessary logging
oiadebayo Aug 8, 2024
464d2f9
Merge branch 'main' into PORT-9398-Add-an-Octopus-Deploy-Ocean-integr…
oiadebayo Aug 8, 2024
2203651
Fix: name not defined
oiadebayo Aug 8, 2024
ebd054e
Merge branch 'PORT-9398-Add-an-Octopus-Deploy-Ocean-integration' of g…
oiadebayo Aug 8, 2024
5852050
Accepted suggested change
oiadebayo Aug 13, 2024
a77212c
Accepted suggested change to update integrations/octopus/main.py
oiadebayo Aug 13, 2024
dfcbd6f
Accepted suggested change to update integrations/octopus/main.py
oiadebayo Aug 13, 2024
98925fe
Merge branch 'main' into PORT-9398-Add-an-Octopus-Deploy-Ocean-integr…
oiadebayo Aug 13, 2024
cddac8e
Attended to suggested comments
oiadebayo Aug 13, 2024
9e7e245
Update CHANGELOG.md
oiadebayo Aug 13, 2024
58e9671
Merge branch 'main' into PORT-9398-Add-an-Octopus-Deploy-Ocean-integr…
oiadebayo Aug 15, 2024
07f2575
Attended to revision comments
oiadebayo Aug 15, 2024
34156c3
Fixed Lint
oiadebayo Aug 15, 2024
004a413
Merge branch 'main' into PORT-9398-Add-an-Octopus-Deploy-Ocean-integr…
oiadebayo Aug 19, 2024
91e08d7
Merge branch 'main' into PORT-9398-Add-an-Octopus-Deploy-Ocean-integr…
oiadebayo Aug 19, 2024
73465fb
Changed Section
oiadebayo Aug 19, 2024
94721db
Merge branch 'main' into PORT-9398-Add-an-Octopus-Deploy-Ocean-integr…
oiadebayo Aug 20, 2024
978b53b
Fix: port-ocean version
oiadebayo Aug 20, 2024
9ce686b
Fix: Added sample test case
oiadebayo Aug 20, 2024
db67279
Added limitation to releases
oiadebayo Aug 21, 2024
3ae6343
Update client.py
oiadebayo Aug 21, 2024
1d2c474
Fix: lint CI
oiadebayo Aug 21, 2024
6b4ed53
Merge branch 'main' into PORT-9398-Add-an-Octopus-Deploy-Ocean-integr…
PeyGis Aug 21, 2024
28e9936
Attended to suggestion by reviewer
oiadebayo Aug 21, 2024
316a37a
Merge branch 'PORT-9398-Add-an-Octopus-Deploy-Ocean-integration' of h…
oiadebayo Aug 21, 2024
deff487
Merge branch 'main' into PORT-9398-Add-an-Octopus-Deploy-Ocean-integr…
oiadebayo Aug 21, 2024
d78f375
Fix Lint
oiadebayo Aug 21, 2024
d3f9e0c
Merge branch 'PORT-9398-Add-an-Octopus-Deploy-Ocean-integration' of h…
oiadebayo Aug 21, 2024
1874c5f
Merge branch 'main' into PORT-9398-Add-an-Octopus-Deploy-Ocean-integr…
oiadebayo Aug 22, 2024
a740e36
ocean version update
oiadebayo Aug 22, 2024
aa9eb72
Update client.py
oiadebayo Aug 22, 2024
b74a41f
Update integrations/octopus/client.py
oiadebayo Aug 22, 2024
06a7f05
Update integrations/octopus/client.py
oiadebayo Aug 22, 2024
59e2fb4
Merge branch 'main' into PORT-9398-Add-an-Octopus-Deploy-Ocean-integr…
oiadebayo Aug 22, 2024
40aceda
Update client.py
oiadebayo Aug 22, 2024
3908e80
Update integrations/octopus/CHANGELOG.md
Tankilevitch Aug 24, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion integrations/octopus/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,15 @@

PAGE_SIZE = 50
WEBHOOK_TIMEOUT = "00:00:50"
CLIENT_TIMEOUT = 60


class OctopusClient:
def __init__(self, server_url: str, octopus_api_key: str) -> None:
self.octopus_url = f"{server_url.rstrip('/')}/api/"
self.api_auth_header = {"X-Octopus-ApiKey": octopus_api_key}
self.client = http_async_client
self.client.timeout = Timeout(60)
self.client.timeout = Timeout(CLIENT_TIMEOUT)
self.client.headers.update(self.api_auth_header)

async def _send_api_request(
Expand Down Expand Up @@ -58,6 +59,8 @@ async def get_paginated_resources(
yield items
if page >= last_page:
break
if kind == 'release' and skip >= 100:
PeyGis marked this conversation as resolved.
Show resolved Hide resolved
break
params["skip"] += PAGE_SIZE
page += 1

Expand Down
Loading