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.

Sign up for GitHub

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

Jump to bottom

Adjust DSN config UI for AWS Authentication #130

Merged
merged 1 commit into from
Apr 5, 2023
Merged

Adjust DSN config UI for AWS Authentication #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions installer/myodbc-installer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,12 +566,12 @@ int list_datasource_details(DataSource *ds)
if (ds->enable_dns_srv) printf("\tENABLE_DNS_SRV\n");
if (ds->multi_host) printf("\tMULTI_HOST\n");
/* AWS Authentication */
if (ds->auth_mode) printf("\tAUTH_MODE");
if (ds->auth_region) printf("\tAUTH_REGION");
if (ds->auth_host) printf("\tAUTH_HOST");
if (ds->auth_port) printf("\tAUTH_PORT");
if (ds->auth_expiration) printf("\tAUTH_EXPIRATION");
if (ds->auth_secret_id) printf("\tAUTH_SECRET_ID");
if (ds->auth_mode) printf("\tAUTHENTICATION_MODE");
if (ds->auth_region) printf("\tAWS_REGION");
if (ds->auth_host) printf("\tIAM_HOST");
if (ds->auth_port) printf("\tIAM_PORT");
if (ds->auth_expiration) printf("\tIAM_EXPIRATION_TIME");
if (ds->auth_secret_id) printf("\tSECRET_ID");
/* Failover */
if (ds->enable_cluster_failover) printf("\tENABLE_CLUSTER_FAILOVER\n");
if (ds->allow_reader_connections) printf("\tALLOW_READER_CONNECTIONS\n");
Expand Down
24 changes: 12 additions & 12 deletions setupgui/windows/odbcdialogparams.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,19 +191,19 @@ IDD_TAB2 DIALOGEX 0, 0, 209, 181
STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
RTEXT "Authentication Mode:", IDC_STATIC, 0, 10, 80, 10
COMBOBOX IDC_EDIT_auth_mode, 85, 10, 85, 10,
RTEXT "Authentication Mode:", IDC_STATIC, -8, 10, 80, 10
COMBOBOX IDC_EDIT_auth_mode, 78, 10, 289, 10,
CBS_DROPDOWN | CBS_AUTOHSCROLL | CBS_SORT | WS_VSCROLL | WS_TABSTOP
RTEXT "Auth Region:", IDC_STATIC, 0, 25, 80, 10
EDITTEXT IDC_EDIT_auth_region, 85, 25, 85, 10, ES_AUTOHSCROLL
RTEXT "IAM Host:", IDC_STATIC, 0, 40, 80, 10
EDITTEXT IDC_EDIT_auth_host, 85, 40, 85, 10, ES_AUTOHSCROLL
RTEXT "IAM Port:", IDC_STATIC, 0, 55, 80, 10
EDITTEXT IDC_EDIT_auth_port, 85, 55, 85, 10, ES_AUTOHSCROLL | ES_NUMBER
RTEXT "IAM Expire Time:", IDC_STATIC, 0, 70, 80, 10
EDITTEXT IDC_EDIT_auth_expiration, 85, 70, 85, 10, ES_AUTOHSCROLL | ES_NUMBER
RTEXT "Secret ID:", IDC_STATIC, 0, 85, 80, 10
EDITTEXT IDC_EDIT_auth_secret_id, 85, 85, 85, 10, ES_AUTOHSCROLL
RTEXT "AWS Region:", IDC_STATIC, -8, 30, 80, 10
EDITTEXT IDC_EDIT_auth_region, 78, 30, 289, 10, ES_AUTOHSCROLL
RTEXT "IAM Host:", IDC_STATIC, -8, 50, 80, 10
EDITTEXT IDC_EDIT_auth_host, 78, 50, 289, 10, ES_AUTOHSCROLL
RTEXT "IAM Port:", IDC_STATIC, -8, 70, 80, 10
EDITTEXT IDC_EDIT_auth_port, 78, 70, 289, 10, ES_AUTOHSCROLL | ES_NUMBER
RTEXT "IAM Expire Time:", IDC_STATIC, -8, 90, 80, 10
EDITTEXT IDC_EDIT_auth_expiration, 78, 90, 289, 10, ES_AUTOHSCROLL | ES_NUMBER
RTEXT "Secret ID:", IDC_STATIC, -8, 110, 80, 10
EDITTEXT IDC_EDIT_auth_secret_id, 78, 110, 289, 10, ES_AUTOHSCROLL
END

#if MFA_ENABLED
Expand Down