-
Notifications
You must be signed in to change notification settings - Fork 733
fix(qdev): configuration and execution not working with iam auth #8785
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
Open
ReeceXW
wants to merge
6
commits into
apache:main
Choose a base branch
from
ReeceXW:fix/qdeveloper-iam-role-auth
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
e6e047f
fix: qdeveloper not working with iam auth
ReeceXW 3a52db6
Merge branch 'main' into fix/qdeveloper-iam-role-auth
ReeceXW 21816e3
chore: implement suggestions
ReeceXW 022089d
Merge branch 'main' of https://github.com/apache/incubator-devlake in…
ReeceXW 0c35369
Merge branch 'main' into fix/qdeveloper-iam-role-auth
ReeceXW 9b4f685
Merge branch 'main' into fix/qdeveloper-iam-role-auth
ReeceXW File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
55 changes: 55 additions & 0 deletions
55
backend/plugins/q_dev/models/migrationscripts/20260320_add_auth_type_to_connection.go
This file contains hidden or 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,55 @@ | ||
| /* | ||
| Licensed to the Apache Software Foundation (ASF) under one or more | ||
| contributor license agreements. See the NOTICE file distributed with | ||
| this work for additional information regarding copyright ownership. | ||
| The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| (the "License"); you may not use this file except in compliance with | ||
| the License. You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package migrationscripts | ||
|
|
||
| import ( | ||
| "github.com/apache/incubator-devlake/core/context" | ||
| "github.com/apache/incubator-devlake/core/dal" | ||
| "github.com/apache/incubator-devlake/core/errors" | ||
| "github.com/apache/incubator-devlake/core/plugin" | ||
| "github.com/apache/incubator-devlake/plugins/q_dev/models" | ||
| ) | ||
|
|
||
| var _ plugin.MigrationScript = (*addAuthTypeToConnection)(nil) | ||
|
|
||
| type addAuthTypeToConnection struct{} | ||
|
|
||
| func (*addAuthTypeToConnection) Up(basicRes context.BasicRes) errors.Error { | ||
| db := basicRes.GetDal() | ||
|
|
||
| if !db.HasColumn("_tool_q_dev_connections", "auth_type") { | ||
| if err := db.AddColumn("_tool_q_dev_connections", "auth_type", dal.Varchar); err != nil { | ||
| return errors.Default.Wrap(err, "failed to add auth_type to _tool_q_dev_connections") | ||
| } | ||
| } | ||
|
|
||
| // Default existing rows to "access_key" since they were created before IAM role support | ||
| if err := db.Exec("UPDATE _tool_q_dev_connections SET auth_type = ? WHERE auth_type IS NULL OR auth_type = ''", models.AuthTypeAccessKey); err != nil { | ||
| return errors.Default.Wrap(err, "failed to set default auth_type for existing connections") | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| func (*addAuthTypeToConnection) Version() uint64 { | ||
| return 20260320000001 | ||
| } | ||
|
|
||
| func (*addAuthTypeToConnection) Name() string { | ||
| return "add auth_type column to _tool_q_dev_connections for IAM role support" | ||
| } |
This file contains hidden or 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
This file contains hidden or 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,42 @@ | ||
| /* | ||
| Licensed to the Apache Software Foundation (ASF) under one or more | ||
| contributor license agreements. See the NOTICE file distributed with | ||
| this work for additional information regarding copyright ownership. | ||
| The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| (the "License"); you may not use this file except in compliance with | ||
| the License. You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package tasks | ||
|
|
||
| import ( | ||
| "github.com/aws/aws-sdk-go/aws" | ||
| "github.com/aws/aws-sdk-go/aws/credentials" | ||
| "github.com/aws/aws-sdk-go/aws/session" | ||
|
|
||
| "github.com/apache/incubator-devlake/plugins/q_dev/models" | ||
| ) | ||
|
|
||
| // newAWSSession creates an AWS session for the given connection and region. | ||
| // For access_key auth, static credentials are used; for iam_role, the default credential chain is used. | ||
| func newAWSSession(conn *models.QDevConnection, region string) (*session.Session, error) { | ||
| cfg := &aws.Config{ | ||
| Region: aws.String(region), | ||
| } | ||
| if !conn.IsIAMRoleAuth() { | ||
| cfg.Credentials = credentials.NewStaticCredentials( | ||
| conn.AccessKeyId, | ||
| conn.SecretAccessKey, | ||
| "", | ||
| ) | ||
| } | ||
| return session.NewSession(cfg) | ||
| } |
This file contains hidden or 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
This file contains hidden or 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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Suggestion (low):
"access_key"and"iam_role"are repeated across validation, tests, migration, and both client files. Consider defining constants:This prevents typo-driven bugs and makes future additions easier to grep for.