Skip to content

Commit

Permalink
Merge branch 'main' into PORT-11871-bug-bug-in-cycle-dependencies-aff…
Browse files Browse the repository at this point in the history
…ecting-argo-cd-integration
  • Loading branch information
Ivan Kalinovski authored and Ivan Kalinovski committed Dec 22, 2024
2 parents 3d49fa7 + 40d2ff4 commit 650d316
Show file tree
Hide file tree
Showing 132 changed files with 4,749 additions and 1,329 deletions.
9 changes: 1 addition & 8 deletions .github/workflows/perf-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,7 @@ jobs:
SMOKE_TEST_SUFFIX: ${{ github.run_id }}
MOCK_PORT_API: ${{ inputs.mock_port_api && '1' || '0' }}
run: |
if [[ "${MOCK_PORT_API}" = "1" ]]; then
make smoke/start-mock-api
make smoke/clean
make smoke/stop-mock-api
else
make smoke/clean
fi
./scripts/clean-smoke-test.sh
- name: Publish Performance Test Summary
run: |
cat ./perf-test-results-${{ github.run_id }}.log.md >> ${GITHUB_STEP_SUMMARY}
11 changes: 11 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,17 @@
"python": "${workspaceFolder}/integrations/backstage/.venv/bin/python",
"request": "launch",
"type": "debugpy"
},
{
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/port_ocean/cli",
"justMyCode": true,
"name": "Run ocean new command",
"program": "${workspaceFolder}/port_ocean/debug_cli.py",
"python": "${workspaceFolder}/.venv/bin/python",
"request": "launch",
"type": "debugpy",
"args": ["new"]
}
]
}
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,33 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

<!-- towncrier release notes start -->
## 0.15.3 (2024-12-22)

### Bug Fixes

- Extended `Ocean new` cli command to fill out more information for the user and also fixed wrong output


## 0.15.2 (2024-12-15)

### Improvements

- Add handling for different installation types compatibility


## 0.15.1 (2024-12-15)

### Bug Fixes

- Changed `SaasOauth` runtime to `SaasOauth2`


## 0.15.0 (2024-12-12)

### Features

- Added `SaasOauth` runtime support


## 0.15.3 (2024-12-15)

Expand Down
23 changes: 15 additions & 8 deletions docs/framework-guides/docs/getting-started/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,18 +44,25 @@ $ [email protected]
release_date [2023-08-06]:
$ 2023-08-06

is_private_integration [y/n] (y):
$ n

🌊 Ahoy, Captain! Your project is ready to set sail into the vast ocean of possibilities!
Here are your next steps:
port_client_id (you can find it using: https://docs.getport.io/build-your-software-catalog/custom-integration/api/#find-your-port-credentials):
$ <your-port-client-id>

port_client_secret (you can find it using: https://docs.getport.io/build-your-software-catalog/custom-integration/api/#find-your-port-credentials):
$ <your-port-client-secret>

⚓️ Install necessary packages: Run make install to install all required packages for your project.
▶️ cd ./my_integration && make install && . .venv/bin/activate
is_us_region [y/n] (n):
$ y

⚓️ Set sail with Ocean: Run ocean sail <path_to_integration> to run the project using Ocean.
▶️ ocean sail ./my_integration
🌊 Ahoy, Captain! Your project is ready to set sail into the vast ocean of possibilities!
Here are your next steps:

⚓️ Smooth sailing with Make: Alternatively, you can run make run to launch your project using Make.
▶️ make run ./my_integration
⚓️ Install necessary packages: Run cd ./my_integration && make install && . .venv/bin/activate to install all required packages for your project.
⚓️ Copy example env file: Run cp .env.example .env and update your integration's configuration in the .env file.
⚓️ Set sail with Ocean: Run ocean sail to run the project using Ocean.
⚓️ Smooth sailing with Make: Alternatively, you can run make run ./my_integration to launch your project using Make.
```
<br/>
Expand Down
Loading

0 comments on commit 650d316

Please sign in to comment.