-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(auth): fix Auth0 integration (#164)
Because - `instill auth login` isnt working This commit - missing auth0 vars - .env for local dev - updated go version - aligned build system - aligned CI - dev and prod tenants working - fix callback error Ticket: https://linear.app/instill-ai/issue/INS-1660/cli-fix-auth-for-cloud-prod ### Testing 1. Create an `.env` file and fill in the secrets ``` # SECRETS # vault / secret / devops / auth0 / prod / client-id INSTILL_OAUTH_CLIENT_ID= # vault / secret / devops / auth0 / prod / client-secret INSTILL_OAUTH_CLIENT_SECRET= # CONFIG INSTILL_OAUTH_HOSTNAME=auth.instill.tech INSTILL_OAUTH_ISSUER=https://auth.instill.tech/ INSTILL_OAUTH_AUDIENCE=https://api.instill.tech INSTILL_OAUTH_CALLBACK_HOST=localhost INSTILL_OAUTH_CALLBACK_PORT=8085 ``` 2. `make bin/instill` 3. `./bin/instill auth login` ### Future work - integration tests with Auth0 - auth for Core instances Co-authored-by: Ping-Lin Chang <[email protected]>
- Loading branch information
1 parent
967e8d1
commit d36f340
Showing
43 changed files
with
345 additions
and
739 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
* @pinglin @phelan164 @xiaofei-du | ||
* @TobiaszCudnik @heiruwu @pinglin |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
The MIT License (MIT) | ||
|
||
Copyright (c) 2023 Instill AI | ||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy | ||
of this software and associated documentation files (the "Software"), to deal | ||
in the Software without restriction, including without limitation the rights | ||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
copies of the Software, and to permit persons to whom the Software is | ||
furnished to do so, subject to the following conditions: | ||
|
||
The above copyright notice and this permission notice shall be included in | ||
all copies or substantial portions of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
THE SOFTWARE. |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
base: | ||
- "**" |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
name: Add PR to Project | ||
|
||
on: | ||
pull_request_target: | ||
types: | ||
- opened | ||
- synchronize | ||
|
||
jobs: | ||
triage: | ||
uses: instill-ai/.github/.github/workflows/add-label-to-pr.yml@main | ||
secrets: | ||
botGitHubToken: ${{ secrets.botGitHubToken }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,92 +1,14 @@ | ||
name: Add PR to Project | ||
|
||
on: | ||
pull_request: | ||
pull_request_target: | ||
types: | ||
- opened | ||
- ready_for_review | ||
|
||
jobs: | ||
track_pr: | ||
runs-on: ubuntu-latest | ||
if: ${{ !github.event.pull_request.draft }} | ||
steps: | ||
- name: Get project data | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.botGitHubToken }} | ||
ORGANIZATION: instill-ai | ||
PROJECT_NUMBER: 5 # Versatile Data Pipeline (VDP) project | ||
run: | | ||
gh api graphql -f query=' | ||
query($org: String!, $number: Int!) { | ||
organization(login: $org){ | ||
projectNext(number: $number) { | ||
id | ||
fields(first:20) { | ||
nodes { | ||
id | ||
name | ||
settings | ||
} | ||
} | ||
} | ||
} | ||
}' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json | ||
echo 'PROJECT_ID='$(jq '.data.organization.projectNext.id' project_data.json) >> $GITHUB_ENV | ||
echo 'DATE_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Date posted") | .id' project_data.json) >> $GITHUB_ENV | ||
echo 'STATUS_FIELD_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") | .id' project_data.json) >> $GITHUB_ENV | ||
echo 'TODO_OPTION_ID='$(jq '.data.organization.projectNext.fields.nodes[] | select(.name== "Status") |.settings | fromjson.options[] | select(.name=="Todo") |.id' project_data.json) >> $GITHUB_ENV | ||
- name: Add PR to project | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.botGitHubToken }} | ||
PR_ID: ${{ github.event.pull_request.node_id }} | ||
run: | | ||
item_id="$( gh api graphql -f query=' | ||
mutation($project:ID!, $pr:ID!) { | ||
addProjectNextItem(input: {projectId: $project, contentId: $pr}) { | ||
projectNextItem { | ||
id | ||
} | ||
} | ||
}' -f project=$PROJECT_ID -f pr=$PR_ID --jq '.data.addProjectNextItem.projectNextItem.id')" | ||
echo 'ITEM_ID='$item_id >> $GITHUB_ENV | ||
- name: Get date | ||
run: echo "DATE=$(date +"%Y-%m-%d")" >> $GITHUB_ENV | ||
|
||
- name: Set fields | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.botGitHubToken }} | ||
run: | | ||
gh api graphql -f query=' | ||
mutation ( | ||
$project: ID! | ||
$item: ID! | ||
$status_field: ID! | ||
$status_value: String! | ||
$date_field: ID! | ||
$date_value: String! | ||
) { | ||
set_status: updateProjectNextItemField(input: { | ||
projectId: $project | ||
itemId: $item | ||
fieldId: $status_field | ||
value: $status_value | ||
}) { | ||
projectNextItem { | ||
id | ||
} | ||
} | ||
set_date_posted: updateProjectNextItemField(input: { | ||
projectId: $project | ||
itemId: $item | ||
fieldId: $date_field | ||
value: $date_value | ||
}) { | ||
projectNextItem { | ||
id | ||
} | ||
} | ||
}' -f project=$PROJECT_ID -f item=$ITEM_ID -f status_field=$STATUS_FIELD_ID -f status_value=${{ env.TODO_OPTION_ID }} -f date_field=$DATE_FIELD_ID -f date_value=$DATE --silent | ||
uses: instill-ai/.github/.github/workflows/add-to-prj.yml@main | ||
with: | ||
project_number: 5 | ||
secrets: | ||
botGitHubToken: ${{ secrets.botGitHubToken }} |
Oops, something went wrong.