From 9c935f28475b8c2df557097469540d802cd220e4 Mon Sep 17 00:00:00 2001 From: Katalina Okano Date: Tue, 15 Dec 2020 21:39:27 -0500 Subject: [PATCH] chore: remove unused go code --- src/common/types/User.go | 20 ------------ src/common/types/session.go | 31 ------------------- src/common/types/tokens.go | 10 ------ .../utils/featureFlags/go/featureflags.go | 1 - .../utils/featureFlags/react/BUILD.bazel | 7 ----- src/common/version/version.go | 21 ------------- src/common/version/version_test.go | 18 ----------- src/discord-bot/discordbot.go | 3 +- 8 files changed, 1 insertion(+), 110 deletions(-) delete mode 100644 src/common/types/User.go delete mode 100644 src/common/types/session.go delete mode 100644 src/common/types/tokens.go delete mode 100644 src/common/utils/featureFlags/go/featureflags.go delete mode 100644 src/common/utils/featureFlags/react/BUILD.bazel delete mode 100644 src/common/version/version.go delete mode 100644 src/common/version/version_test.go diff --git a/src/common/types/User.go b/src/common/types/User.go deleted file mode 100644 index 9426f48..0000000 --- a/src/common/types/User.go +++ /dev/null @@ -1,20 +0,0 @@ -package types - -type DiscordUser struct { - ID string `json:"id,omitempty"` - Username string `json:"username,omitempty"` - Discriminator string `json:"discriminator,omitempty"` - Avatar string `json:"avatar,omitempty"` - Bot bool `json:"bot,omitempty"` -} - -type Member struct { - GuildID string `json:"guildid,omitempty"` - Roles []string `json:"rolesList,omitempty"` - Nick string `json:"nick,omitempty"` - User DiscordUser `json:"user,omitempty"` -} - -type RoleypolyUser struct { - DiscordUser DiscordUser `json:"discorduser,omitempty"` -} diff --git a/src/common/types/session.go b/src/common/types/session.go deleted file mode 100644 index edf2a99..0000000 --- a/src/common/types/session.go +++ /dev/null @@ -1,31 +0,0 @@ -package types - -import "time" - -// CreateSessionRequest is the payload to /create-session -type CreateSessionRequest struct { - AccessTokenResponse AccessTokenResponse - Fingerprint Fingerprint -} - -type Fingerprint struct { - UserAgent string - ClientIP string - ForwardedFor string -} - -type CreateSessionResponse struct { - SessionID string -} - -type SessionData struct { - SessionID string - Fingerprint Fingerprint - AccessTokens AccessTokenResponse - UserData UserData -} - -type UserData struct { - DataExpires time.Time - UserID string -} diff --git a/src/common/types/tokens.go b/src/common/types/tokens.go deleted file mode 100644 index ca13d09..0000000 --- a/src/common/types/tokens.go +++ /dev/null @@ -1,10 +0,0 @@ -package types - -// AccessTokenResponse is the response for Discord's OAuth token grant flow -type AccessTokenResponse struct { - AccessToken string `json:"access_token"` - TokenType string `json:"token_type"` - ExpiresIn int `json:"expires_in"` - RefreshToken string `json:"refresh_token"` - Scope string `json:"scope"` -} diff --git a/src/common/utils/featureFlags/go/featureflags.go b/src/common/utils/featureFlags/go/featureflags.go deleted file mode 100644 index 5059f58..0000000 --- a/src/common/utils/featureFlags/go/featureflags.go +++ /dev/null @@ -1 +0,0 @@ -package featureflags diff --git a/src/common/utils/featureFlags/react/BUILD.bazel b/src/common/utils/featureFlags/react/BUILD.bazel deleted file mode 100644 index 19da708..0000000 --- a/src/common/utils/featureFlags/react/BUILD.bazel +++ /dev/null @@ -1,7 +0,0 @@ -load("//hack/bazel/js:react.bzl", "react_library") - -package(default_visibility = ["//visibility:public"]) - -react_library( - name = "react", -) diff --git a/src/common/version/version.go b/src/common/version/version.go deleted file mode 100644 index 564677d..0000000 --- a/src/common/version/version.go +++ /dev/null @@ -1,21 +0,0 @@ -package version - -import ( - "fmt" -) - -var ( - GitCommit = "unknown" - GitBranch = "unknown" - BuildDate = "unknown" -) - -func StartupInfo(serviceName string) string { - return fmt.Sprintf( - "Starting %s service.\n Build %s (%s) at %s", - serviceName, - GitCommit, - GitBranch, - BuildDate, - ) -} diff --git a/src/common/version/version_test.go b/src/common/version/version_test.go deleted file mode 100644 index 5e44d02..0000000 --- a/src/common/version/version_test.go +++ /dev/null @@ -1,18 +0,0 @@ -package version - -import ( - "testing" - "time" -) - -func TestStartup(t *testing.T) { - GitBranch = "test" - GitCommit = "e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e" - BuildDate = time.Now().UTC().Format("2006-01-02T15:04:05.000Z") - - expected := "Starting test service.\n Build e5fa44f2b31c1fb553b6021e7360d07d5d91ff5e (test) at " + BuildDate - value := StartupInfo("test") - if value != expected { - t.Error("Incorrect render, got `", value, "`") - } -} diff --git a/src/discord-bot/discordbot.go b/src/discord-bot/discordbot.go index 5a729c6..0371d47 100644 --- a/src/discord-bot/discordbot.go +++ b/src/discord-bot/discordbot.go @@ -5,7 +5,6 @@ import ( _ "github.com/joho/godotenv/autoload" "github.com/roleypoly/roleypoly/src/common" "github.com/roleypoly/roleypoly/src/common/bot" - "github.com/roleypoly/roleypoly/src/common/version" "k8s.io/klog" ) @@ -19,7 +18,7 @@ var ( ) func main() { - klog.Info(version.StartupInfo("discord-bot")) + klog.Info("bot started") err := bot.ScaffoldBot(bot.BotScaffolding{ RootUsers: rootUsers,