Merge pull request #51 from unity-sds/remove_github_token

Removes use of Github token provided by SSM

Author: jdrodjpl

backend/cmd/web/main.go

@@ -108,7 +108,6 @@ func initConfig() {
 		viper.AddConfigPath(configdir)
 		viper.SetConfigType("yaml")
 		viper.SetConfigName("unity")
-		viper.SetDefault("GithubToken", "unset")
 		viper.SetDefault("MarketplaceOwner", "unity-sds")
 		viper.SetDefault("MarketplaceRepo", "unity-marketplace")
 		viper.SetDefault("Workdir", filepath.Join(path, "workdir"))

backend/internal/application/config/init.go

@@ -20,7 +20,6 @@ type MarketplaceItem struct {
 }
 
 type AppConfig struct {
-	GithubToken          string
 	MarketplaceBaseUrl   string
 	MarketplaceOwner     string
 	MarketplaceRepo      string

backend/internal/models/websocket.pb.go

@@ -20,7 +20,6 @@ import (
 func BootstrapEnv(appconf *config.AppConfig) error {
 	// Print out everything in appConfig
 	log.Infof("AppConfig contents:")
-	log.Infof("GithubToken: %s", appconf.GithubToken)
 	log.Infof("MarketplaceBaseUrl: %s", appconf.MarketplaceBaseUrl)
 	log.Infof("MarketplaceOwner: %s", appconf.MarketplaceOwner)
 	log.Infof("MarketplaceRepo: %s", appconf.MarketplaceRepo)

backend/internal/processes/bootstrap.go

@@ -11,7 +11,6 @@ import (
 func TestInstallMarketplaceApplication(t *testing.T) {
 
 	appConf := config2.AppConfig{
-		GithubToken:          "",
 		MarketplaceOwner:     "",
 		MarketplaceRepo:      "",
 		AWSRegion:            "",
@@ -42,7 +41,6 @@ func TestInstallMarketplaceApplication(t *testing.T) {
 func TestUpdateCoreConfig(t *testing.T) {
 	store, _ := database.NewGormDatastore()
 	appConf := config2.AppConfig{
-		GithubToken:          "",
 		MarketplaceOwner:     "",
 		MarketplaceRepo:      "",
 		AWSRegion:            "",

backend/internal/processes/installer_test.go

@@ -15,9 +15,6 @@ func ProcessSimpleMessage(message *marketplace.SimpleMessage, conf *config.AppCo
 	if message.Operation == "request config" {
 		log.Info("Request Config received")
 		return fetchConfig(conf, store)
-	} else if message.Operation == "request parameters" {
-		log.Info("Request Parameters received")
-		return fetchParameters(conf)
 	} else if message.Operation == "update config" {
 		log.Info("Update config received")
 		//return updateParameters()
@@ -65,23 +62,6 @@ func UpdateParameters(params *marketplace.Parameters, store database.Datastore,
 
 }
 
-func fetchParameters(conf *config.AppConfig) ([]byte, error) {
-	db, err := database.NewGormDatastore()
-
-	params, err := db.FetchSSMParams()
-
-	ssm, err := aws.ReadSSMParameters(params)
-
-	paramwrap := marketplace.UnityWebsocketMessage_Parameters{Parameters: ssm}
-	msg := &marketplace.UnityWebsocketMessage{Content: &paramwrap}
-	data, err := proto.Marshal(msg)
-	if err != nil {
-		log.WithError(err).Error("Failed to marshal config")
-		return nil, err
-	}
-
-	return data, nil
-}
 func fetchConfig(conf *config.AppConfig, store database.Datastore) ([]byte, error) {
 
 	//coreconf, err := store.FetchCoreParams()
@@ -101,7 +81,6 @@ func fetchConfig(conf *config.AppConfig, store database.Datastore) ([]byte, erro
 	}
 
 	appConfig := marketplace.Config_ApplicationConfig{
-		GithubToken:      conf.GithubToken,
 		MarketplaceOwner: conf.MarketplaceOwner,
 		MarketplaceUser:  conf.MarketplaceRepo,
 		Project:          conf.Project,
@@ -123,7 +102,7 @@ func fetchConfig(conf *config.AppConfig, store database.Datastore) ([]byte, erro
 	} else if bootstrapfailed.Owner != "" {
 		bsoutput = "failed"
 	}
-	
+
 	genconfig := &marketplace.Config{
 
 		ApplicationConfig: &appConfig,