From 5acb5ee61690273500da51ad73ee52e7f9f6cfe8 Mon Sep 17 00:00:00 2001 From: Laura Lin <13591898+lauralindy@users.noreply.github.com> Date: Mon, 6 Nov 2023 17:24:49 -0800 Subject: [PATCH 1/4] adding consoleUrl parameterization based on partition Signed-off-by: Laura Lin <13591898+lauralindy@users.noreply.github.com> --- flyteplugins/go/tasks/plugins/webapi/athena/plugin.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go b/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go index a1f16163fe..2ca8e66c81 100644 --- a/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go @@ -3,6 +3,7 @@ package athena import ( "context" "fmt" + "strings" "time" awsSdk "github.com/aws/aws-sdk-go-v2/aws" @@ -177,12 +178,19 @@ func (p Plugin) Status(ctx context.Context, tCtx webapi.StatusContext) (phase co func createTaskInfo(queryID string, cfg awsSdk.Config) *core.TaskInfo { timeNow := time.Now() + var consoleUrl str + if strings.Contains(cfg.Region, "gov") { + consoleUrl = "console.amazonaws-us-gov.com" + } else { + consoleUrl = "console.aws.amazon.com + } return &core.TaskInfo{ OccurredAt: &timeNow, Logs: []*idlCore.TaskLog{ { - Uri: fmt.Sprintf("https://%v.console.aws.amazon.com/athena/home?force®ion=%v#query/history/%v", + Uri: fmt.Sprintf("https://%v.%v/athena/home?force®ion=%v#query/history/%v", cfg.Region, + consoleUrl, cfg.Region, queryID), Name: "Athena Query Console", From 96fe77ba41f9f6f572d2a8f6295fafe7a21105c7 Mon Sep 17 00:00:00 2001 From: Laura Lin <13591898+lauralindy@users.noreply.github.com> Date: Mon, 6 Nov 2023 19:58:16 -0800 Subject: [PATCH 2/4] Update plugin.go Signed-off-by: Laura Lin <13591898+lauralindy@users.noreply.github.com> --- flyteplugins/go/tasks/plugins/webapi/athena/plugin.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go b/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go index 2ca8e66c81..5c10b6334c 100644 --- a/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go @@ -178,11 +178,11 @@ func (p Plugin) Status(ctx context.Context, tCtx webapi.StatusContext) (phase co func createTaskInfo(queryID string, cfg awsSdk.Config) *core.TaskInfo { timeNow := time.Now() - var consoleUrl str + var consoleUrl string if strings.Contains(cfg.Region, "gov") { consoleUrl = "console.amazonaws-us-gov.com" } else { - consoleUrl = "console.aws.amazon.com + consoleUrl = "console.aws.amazon.com" } return &core.TaskInfo{ OccurredAt: &timeNow, From 879ca56e5e03947f066c30d8610b8801b4780b98 Mon Sep 17 00:00:00 2001 From: Laura Lin <13591898+lauralindy@users.noreply.github.com> Date: Mon, 6 Nov 2023 19:59:07 -0800 Subject: [PATCH 3/4] Update plugin_test.go Signed-off-by: Laura Lin <13591898+lauralindy@users.noreply.github.com> --- .../go/tasks/plugins/webapi/athena/plugin_test.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/flyteplugins/go/tasks/plugins/webapi/athena/plugin_test.go b/flyteplugins/go/tasks/plugins/webapi/athena/plugin_test.go index 6e3238d813..e19829447e 100644 --- a/flyteplugins/go/tasks/plugins/webapi/athena/plugin_test.go +++ b/flyteplugins/go/tasks/plugins/webapi/athena/plugin_test.go @@ -22,3 +22,18 @@ func TestCreateTaskInfo(t *testing.T) { assert.Len(t, taskInfo.ExternalResources, 1) assert.Equal(t, taskInfo.ExternalResources[0].ExternalID, "query_id") } + + +func TestCreateTaskInfoGovAWS(t *testing.T) { + taskInfo := createTaskInfo("query_id", awsSdk.Config{ + Region: "us-gov-east-1", + }) + assert.EqualValues(t, []*idlCore.TaskLog{ + { + Uri: "https://us-gov-east-1.console.amazonaws-us-gov.com/athena/home?force®ion=us-gov-east-1#query/history/query_id", + Name: "Athena Query Console", + }, + }, taskInfo.Logs) + assert.Len(t, taskInfo.ExternalResources, 1) + assert.Equal(t, taskInfo.ExternalResources[0].ExternalID, "query_id") +} From 8b09838b4ae8ec5d2abba09d2f441e0a087e0c4f Mon Sep 17 00:00:00 2001 From: Laura Lin <13591898+lauralindy@users.noreply.github.com> Date: Tue, 7 Nov 2023 10:31:34 -0800 Subject: [PATCH 4/4] lint Signed-off-by: Laura Lin <13591898+lauralindy@users.noreply.github.com> --- flyteplugins/go/tasks/plugins/webapi/athena/plugin.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go b/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go index 5c10b6334c..826a12e45f 100644 --- a/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go +++ b/flyteplugins/go/tasks/plugins/webapi/athena/plugin.go @@ -178,11 +178,11 @@ func (p Plugin) Status(ctx context.Context, tCtx webapi.StatusContext) (phase co func createTaskInfo(queryID string, cfg awsSdk.Config) *core.TaskInfo { timeNow := time.Now() - var consoleUrl string + var consoleURL string if strings.Contains(cfg.Region, "gov") { - consoleUrl = "console.amazonaws-us-gov.com" + consoleURL = "console.amazonaws-us-gov.com" } else { - consoleUrl = "console.aws.amazon.com" + consoleURL = "console.aws.amazon.com" } return &core.TaskInfo{ OccurredAt: &timeNow, @@ -190,7 +190,7 @@ func createTaskInfo(queryID string, cfg awsSdk.Config) *core.TaskInfo { { Uri: fmt.Sprintf("https://%v.%v/athena/home?force®ion=%v#query/history/%v", cfg.Region, - consoleUrl, + consoleURL, cfg.Region, queryID), Name: "Athena Query Console",