Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 09:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Feature : AWS Default Credential Provider Chain as an authentication option in AWS S3 datasource (#14171)

Browse source 
* added default credential chain flow

* Bump version to 3.20.5-lts across all components and add tag-and-push script for releases

---------

Co-authored-by: gsmithun4 <gsmithun4@gmail.com>
This commit is contained in:
Ganesh Kumar 2025-09-26 20:48:25 +05:30 committed by GitHub
parent 9167b950ae
commit 69bb50ad48
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 64 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.version
View file

@ -1 +1 @@
3.20.4-lts
3.20.5-lts

2
frontend/.version
View file

@ -1 +1 @@
3.20.4-lts
3.20.5-lts

7
plugins/packages/s3/lib/index.ts
View file

@ -94,9 +94,11 @@ export default class S3QueryService implements QueryService {
}
async getConnection(sourceOptions: SourceOptions): Promise<any> {
const useAWSInstanceProfile = sourceOptions['instance_metadata_credentials'] === 'aws_instance_credentials';
const region = sourceOptions['region'];
const useAWSInstanceProfile = sourceOptions['instance_metadata_credentials'] === 'aws_instance_credentials';
const useRoleArn = sourceOptions['instance_metadata_credentials'] === 'aws_arn_role';
const useDefaultCredentialProviderChain =
sourceOptions['instance_metadata_credentials'] === 'default_credentials_provider_chain';
if (useAWSInstanceProfile) {
const client = new S3Client({ region, credentials: fromInstanceMetadata() });
@ -111,6 +113,9 @@ export default class S3QueryService implements QueryService {
const client = new S3Client({ region, credentials });
return client;
} else if (useDefaultCredentialProviderChain) {
const client = new S3Client({ region });
return client;
} else {
const credentials = new AWS.Credentials(sourceOptions['access_key'], sourceOptions['secret_key']);
const endpointOptions = sourceOptions.endpoint_enabled && {

4
plugins/packages/s3/lib/manifest.json
View file

@ -65,6 +65,10 @@
{
"value": "aws_arn_role",
"name": "Use AWS ARN Role"
},
{
"value": "default_credentials_provider_chain",
"name": "Default Credential Provider Chain"
}
],
"commonFields": {

51
release-scripts/tag-and-push.sh Normal file
View file

@ -0,0 +1,51 @@
#!/bin/sh
set -e
BASE_DIR="$(dirname "$(dirname "$0")")"
BASE_VERSION_FILE="$BASE_DIR/.version"
SERVER_VERSION_FILE="$BASE_DIR/server/.version"
FRONTEND_VERSION_FILE="$BASE_DIR/frontend/.version"
# Read first line of each version file (trim spaces)
BASE_VERSION=$(head -n 1 "$BASE_VERSION_FILE" | tr -d '[:space:]')
SERVER_VERSION=$(head -n 1 "$SERVER_VERSION_FILE" | tr -d '[:space:]')
FRONTEND_VERSION=$(head -n 1 "$FRONTEND_VERSION_FILE" | tr -d '[:space:]')
# Check versions match
if [ "$BASE_VERSION" != "$SERVER_VERSION" ] || [ "$BASE_VERSION" != "$FRONTEND_VERSION" ]; then
echo "❌ Version mismatch detected!"
echo "Base: $BASE_VERSION"
echo "Server: $SERVER_VERSION"
echo "Frontend: $FRONTEND_VERSION"
exit 1
fi
RELEASE_VERSION="v$BASE_VERSION"
echo "Are you sure you want to release version - $RELEASE_VERSION ? (y/n)"
read CONFIRM
if [ "$CONFIRM" != "y" ]; then
echo "❌ Release aborted."
exit 1
fi
echo "✅ Starting release process for $RELEASE_VERSION..."
# Tag & push in base
cd "$BASE_DIR"
git tag "$RELEASE_VERSION"
git push origin "$RELEASE_VERSION"
# Tag & push in server/ee
cd "$BASE_DIR/server/ee"
git tag "$RELEASE_VERSION"
git push origin "$RELEASE_VERSION"
# Tag & push in frontend/ee
cd "$BASE_DIR/frontend/ee"
git tag "$RELEASE_VERSION"
git push origin "$RELEASE_VERSION"
echo "🎉 Successfully released $RELEASE_VERSION"

2
server/.version
View file

@ -1 +1 @@
3.20.4-lts
3.20.5-lts