storj/storj: some domain changes we can make now

Change-Id: I5622edea9dfcad788cac65e1754b331b9fed6154
2021-04-09 16:25:25 -06:00 · 2021-04-09 16:25:25 -06:00 · afcc55fb47
commit afcc55fb47
parent 0b59a165e9
9 changed files with 19 additions and 36 deletions
--- a/README.md
+++ b/README.md
@ -98,10 +98,10 @@ Use Github to open a pull request!

 ### A Note about Versioning

-While we are practicing [semantic versioning](https://semver.org/) for our client 
-libraries such as [uplink](https://github.com/storj/uplink), we are *not* practicing 
-semantic versioning in this repo, as we do not intend for it to be used via 
-[Go modules](https://blog.golang.org/using-go-modules). We may have 
+While we are practicing [semantic versioning](https://semver.org/) for our client
+libraries such as [uplink](https://github.com/storj/uplink), we are *not* practicing
+semantic versioning in this repo, as we do not intend for it to be used via
+[Go modules](https://blog.golang.org/using-go-modules). We may have
 backwards-incompatible changes between minor and patch releases in this repo.

 # Start using Storj
@ -127,5 +127,5 @@ code under Apache v2, or other licenses in the future.
 # Support

 If you have any questions or suggestions please reach out to us on
-[our community forum](https://forum.storj.io/) or
-email us at support@tardigrade.io.
+[our community forum](https://forum.storj.io/) or file a ticket at
+https://support.storj.io/.
--- a/cmd/uplink/cmd/setup.go
+++ b/cmd/uplink/cmd/setup.go
@ -153,7 +153,7 @@ func cmdSetup(cmd *cobra.Command, args []string) (err error) {
 	fmt.Println(`
 Your Uplink CLI is configured and ready to use!

-* See https://documentation.tardigrade.io/api-reference/uplink-cli for some example commands`)
+* See https://docs.storj.io/api-reference/uplink-cli for some example commands`)

 	return nil
 }
--- a/cmd/uplink/cmd/share.go
+++ b/cmd/uplink/cmd/share.go
@ -38,7 +38,7 @@ var shareCfg struct {
 	Register    bool   `default:"false" help:"if true, creates and registers access grant" basic-help:"true"`
 	URL         bool   `default:"false" help:"if true, returns a url for the shared path. implies --register and --public" basic-help:"true"`
 	DNS         string `default:"" help:"specify your custom hostname. if set, returns dns settings for web hosting. implies --register and --public" basic-help:"true"`
-	AuthService string `default:"https://auth.tardigradeshare.io" help:"url for shared auth service" basic-help:"true"`
+	AuthService string `default:"https://auth.us1.storjshare.io" help:"url for shared auth service" basic-help:"true"`
 	Public      bool   `default:"false" help:"if true, the access will be public. --dns and --url override this" basic-help:"true"`

 	// Share requires information about the current access
--- a/satellite/api.go
+++ b/satellite/api.go
@ -354,11 +354,6 @@ func NewAPI(log *zap.Logger, full *identity.FullIdentity, db DB,
 		peer.Marketing.PartnersService = rewards.NewPartnersService(
 			peer.Log.Named("partners"),
 			rewards.DefaultPartnersDB,
-			[]string{
-				"https://us-central-1.tardigrade.io/",
-				"https://asia-east-1.tardigrade.io/",
-				"https://europe-west-1.tardigrade.io/",
-			},
 		)
 	}

--- a/satellite/console/consoleweb/consoleql/mutation_test.go
+++ b/satellite/console/consoleweb/consoleql/mutation_test.go
@ -53,11 +53,6 @@ func TestGraphqlMutation(t *testing.T) {
 		partnersService := rewards.NewPartnersService(
 			log.Named("partners"),
 			rewards.DefaultPartnersDB,
-			[]string{
-				"https://us-central-1.tardigrade.io/",
-				"https://asia-east-1.tardigrade.io/",
-				"https://europe-west-1.tardigrade.io/",
-			},
 		)

 		analyticsService := analytics.NewService(log, analytics.Config{}, "test-satellite")
--- a/satellite/console/consoleweb/consoleql/query_test.go
+++ b/satellite/console/consoleweb/consoleql/query_test.go
@ -37,11 +37,6 @@ func TestGraphqlQuery(t *testing.T) {
 		partnersService := rewards.NewPartnersService(
 			log.Named("partners"),
 			rewards.DefaultPartnersDB,
-			[]string{
-				"https://us-central-1.tardigrade.io/",
-				"https://asia-east-1.tardigrade.io/",
-				"https://europe-west-1.tardigrade.io/",
-			},
 		)

 		analyticsService := analytics.NewService(log, analytics.Config{}, "test-satellite")
--- a/satellite/console/consoleweb/server.go
+++ b/satellite/console/consoleweb/server.go
@ -69,7 +69,7 @@ type Config struct {
 	AuthTokenSecret string `help:"secret used to sign auth tokens" releaseDefault:"" devDefault:"my-suppa-secret-key"`

 	ContactInfoURL                  string `help:"url link to contacts page" default:"https://forum.storj.io"`
-	FrameAncestors                  string `help:"allow domains to embed the satellite in a frame, space separated" default:"tardigrade.io"`
+	FrameAncestors                  string `help:"allow domains to embed the satellite in a frame, space separated" default:"tardigrade.io storj.io"`
 	LetUsKnowURL                    string `help:"url link to let us know page" default:"https://storjlabs.atlassian.net/servicedesk/customer/portals"`
 	SEO                             string `help:"used to communicate with web crawlers and other web robots" default:"User-agent: *\nDisallow: \nDisallow: /cgi-bin/"`
 	SatelliteName                   string `help:"used to display at web satellite console" default:"Storj"`
@ -80,11 +80,11 @@ type Config struct {
 	PartneredSatelliteNames         string `help:"names of partnered satellites" default:"US-Central-1,Europe-West-1,Asia-East-1"`
 	GeneralRequestURL               string `help:"url link to general request page" default:"https://support.tardigrade.io/hc/en-us/requests/new?ticket_form_id=360000379291"`
 	ProjectLimitsIncreaseRequestURL string `help:"url link to project limit increase request page" default:"https://support.tardigrade.io/hc/en-us/requests/new?ticket_form_id=360000683212"`
-	GatewayCredentialsRequestURL    string `help:"url link for gateway credentials requests" default:"https://auth.tardigradeshare.io"`
+	GatewayCredentialsRequestURL    string `help:"url link for gateway credentials requests" default:"https://auth.us1.storjshare.io"`
 	IsBetaSatellite                 bool   `help:"indicates if satellite is in beta" default:"false"`
 	BetaSatelliteFeedbackURL        string `help:"url link for for beta satellite feedback" default:""`
 	BetaSatelliteSupportURL         string `help:"url link for for beta satellite support" default:""`
-	DocumentationURL                string `help:"url link to documentation" devDefault:"https://documentation.storj.io/" releaseDefault:"https://documentation.tardigrade.io/"`
+	DocumentationURL                string `help:"url link to documentation" default:"https://docs.storj.io/"`
 	CouponCodeUIEnabled             bool   `help:"indicates if user is allowed to add coupon codes to account" default:"false"`
 	FileBrowserFlowDisabled         bool   `help:"indicates if file browser flow is disabled" default:"false"`
 	CSPEnabled                      bool   `help:"indicates if Content Security Policy is enabled" devDefault:"false" releaseDefault:"true"`
--- a/satellite/rewards/partners_service.go
+++ b/satellite/rewards/partners_service.go
@ -38,17 +38,15 @@ type PartnersDB interface {
 //
 // architecture: Service
 type PartnersService struct {
-	log     *zap.Logger
-	db      PartnersDB
-	domains []string
+	log *zap.Logger
+	db  PartnersDB
 }

 // NewPartnersService returns a service for handling partner information.
-func NewPartnersService(log *zap.Logger, db PartnersDB, domains []string) *PartnersService {
+func NewPartnersService(log *zap.Logger, db PartnersDB) *PartnersService {
 	return &PartnersService{
-		log:     log,
-		db:      db,
-		domains: domains,
+		log: log,
+		db:  db,
 	}
 }

--- a/scripts/testdata/satellite-config.yaml.lock
+++ b/scripts/testdata/satellite-config.yaml.lock
@ -101,7 +101,7 @@ compensation.withheld-percents: 75,75,75,50,50,50,25,25,25,0,0,0,0,0,0
 # console.default-project-limit: 3

 # url link to documentation
-# console.documentation-url: https://documentation.tardigrade.io/
+# console.documentation-url: https://docs.storj.io/

 # external endpoint of the satellite if hosted
 # console.external-address: ""
@ -110,10 +110,10 @@ compensation.withheld-percents: 75,75,75,50,50,50,25,25,25,0,0,0,0,0,0
 # console.file-browser-flow-disabled: false

 # allow domains to embed the satellite in a frame, space separated
-# console.frame-ancestors: tardigrade.io
+# console.frame-ancestors: tardigrade.io storj.io

 # url link for gateway credentials requests
-# console.gateway-credentials-request-url: https://auth.tardigradeshare.io
+# console.gateway-credentials-request-url: https://auth.us1.storjshare.io

 # url link to general request page
 # console.general-request-url: https://support.tardigrade.io/hc/en-us/requests/new?ticket_form_id=360000379291