From 09928a7f2b17f15fba64fc1e20a6a18fbe63f3e5 Mon Sep 17 00:00:00 2001 From: Ben Arent Date: Wed, 25 Nov 2020 11:18:55 -0800 Subject: [PATCH] Cherry pick Gravitational -> GoTeleport (#4932) --- CODE_OF_CONDUCT.md | 2 +- lib/auth/saml.go | 2 +- lib/config/configuration.go | 2 +- lib/events/gcssessions/gcsstream_test.go | 2 +- lib/kube/proxy/auth.go | 4 ++-- lib/service/cfg.go | 2 +- lib/utils/parse/parse.go | 2 +- tool/teleport/common/teleport.go | 2 +- tool/tsh/tsh.go | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 9d70a91cae671..d3ac05892f5a5 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe ## Enforcement -Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at info@gravitational.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at info@goteleport.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately. Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership. diff --git a/lib/auth/saml.go b/lib/auth/saml.go index 5cc6eb60f91b7..bfab8f37878cd 100644 --- a/lib/auth/saml.go +++ b/lib/auth/saml.go @@ -351,7 +351,7 @@ func (a *Server) validateSAMLResponse(samlResponse string) (*samlAuthResponse, e } assertionInfo, err := provider.RetrieveAssertionInfo(samlResponse) if err != nil { - log.Warnf("Received response with incorrect or no claims/attribute statements. Please check the identity provider configuration to make sure that mappings for claims/attribute statements are set up correctly. . Failed to retrieve SAML AssertionInfo from response: %v.", err) + log.Warnf("Received response with incorrect or no claims/attribute statements. Please check the identity provider configuration to make sure that mappings for claims/attribute statements are set up correctly. . Failed to retrieve SAML AssertionInfo from response: %v.", err) return nil, trace.AccessDenied("bad SAML response") } diff --git a/lib/config/configuration.go b/lib/config/configuration.go index 12f4fb8844c97..e9360fc604b69 100644 --- a/lib/config/configuration.go +++ b/lib/config/configuration.go @@ -667,7 +667,7 @@ func applySSHConfig(fc *FileConfig, cfg *service.Config) error { if !pam.BuildHasPAM() { errorMessage := "Unable to start Teleport: PAM was enabled in file configuration but this \n" + "Teleport binary was built without PAM support. To continue either download a \n" + - "Teleport binary build with PAM support from https://gravitational.com/teleport \n" + + "Teleport binary build with PAM support from https://goteleport.com/teleport \n" + "or disable PAM in file configuration." return trace.BadParameter(errorMessage) } diff --git a/lib/events/gcssessions/gcsstream_test.go b/lib/events/gcssessions/gcsstream_test.go index 3aac7b1b2704b..fbb00a66d031a 100644 --- a/lib/events/gcssessions/gcsstream_test.go +++ b/lib/events/gcssessions/gcsstream_test.go @@ -41,7 +41,7 @@ func TestStreams(t *testing.T) { uri := os.Getenv(teleport.GCSTestURI) if uri == "" { t.Skip( - fmt.Sprintf("Skipping GCS tests, set env var %q, details here: https://gravitational.com/teleport/docs/gcp_guide/", + fmt.Sprintf("Skipping GCS tests, set env var %q, details here: https://goteleport.com/teleport/docs/gcp-guide/", teleport.GCSTestURI)) } u, err := url.Parse(uri) diff --git a/lib/kube/proxy/auth.go b/lib/kube/proxy/auth.go index db7fd72058bd7..63c91950478b7 100644 --- a/lib/kube/proxy/auth.go +++ b/lib/kube/proxy/auth.go @@ -195,10 +195,10 @@ func checkImpersonationPermissions(ctx context.Context, sarClient authztypes.Sel }, }, metav1.CreateOptions{}) if err != nil { - return trace.Wrap(err, "failed to verify impersonation permissions for kubernetes: %v; this may be due to missing the SelfSubjectAccessReview permission on the ClusterRole used by the proxy; please make sure that proxy has all the necessary permissions: https://gravitational.com/teleport/docs/kubernetes_ssh/#impersonation", err) + return trace.Wrap(err, "failed to verify impersonation permissions for kubernetes: %v; this may be due to missing the SelfSubjectAccessReview permission on the ClusterRole used by the proxy; please make sure that proxy has all the necessary permissions: https://goteleport.com/teleport/docs/kubernetes-ssh/#impersonation", err) } if !resp.Status.Allowed { - return trace.AccessDenied("proxy can't impersonate kubernetes %s at the cluster level; please make sure that proxy has all the necessary permissions: https://gravitational.com/teleport/docs/kubernetes_ssh/#impersonation", resource) + return trace.AccessDenied("proxy can't impersonate kubernetes %s at the cluster level; please make sure that proxy has all the necessary permissions: https://goteleport.com/teleport/docs/kubernetes-ssh/#impersonation", resource) } } return nil diff --git a/lib/service/cfg.go b/lib/service/cfg.go index 24254b9be94e6..7010c4dd400b5 100644 --- a/lib/service/cfg.go +++ b/lib/service/cfg.go @@ -554,7 +554,7 @@ func (a App) Check() error { // are invalid subdomains because for trusted clusters the name is used to // construct the domain that the application will be available at. if errs := validation.IsDNS1035Label(a.Name); len(errs) > 0 { - return trace.BadParameter("application name %q must be a valid DNS subdomain: https://gravitational.com/teleport/docs/application-access/#application-name", a.Name) + return trace.BadParameter("application name %q must be a valid DNS subdomain: https://goteleport.com/teleport/docs/application-access/#application-name", a.Name) } // Parse and validate URL. if _, err := url.Parse(a.URI); err != nil { diff --git a/lib/utils/parse/parse.go b/lib/utils/parse/parse.go index 51234dcd9c17f..c4270d4a7e500 100644 --- a/lib/utils/parse/parse.go +++ b/lib/utils/parse/parse.go @@ -180,7 +180,7 @@ type Matcher interface { func NewMatcher(value string) (m Matcher, err error) { defer func() { if err != nil { - err = trace.WrapWithMessage(err, "see supported syntax at https://gravitational.com/teleport/docs/enterprise/ssh-rbac/#rbac-for-hosts") + err = trace.WrapWithMessage(err, "see supported syntax at https://goteleport.com/teleport/docs/enterprise/ssh-rbac/#rbac-for-hosts") } }() match := reVariable.FindStringSubmatch(value) diff --git a/tool/teleport/common/teleport.go b/tool/teleport/common/teleport.go index 8c24deb4752ad..e4778bf1bfc51 100644 --- a/tool/teleport/common/teleport.go +++ b/tool/teleport/common/teleport.go @@ -59,7 +59,7 @@ func Run(options Options) (executedCommand string, conf *service.Config) { // configure logger for a typical CLI scenario until configuration file is // parsed utils.InitLogger(utils.LoggingForDaemon, log.ErrorLevel) - app := utils.InitCLIParser("teleport", "Clustered SSH service. Learn more at https://gravitational.com/teleport") + app := utils.InitCLIParser("teleport", "Clustered SSH service. Learn more at https://goteleport.com/teleport") // define global flags: var ccf config.CommandLineFlags diff --git a/tool/tsh/tsh.go b/tool/tsh/tsh.go index f75f2b8bedf74..a3b0e90638d7f 100644 --- a/tool/tsh/tsh.go +++ b/tool/tsh/tsh.go @@ -1575,7 +1575,7 @@ func printProfiles(debug bool, profile *client.ProfileStatus, profiles []*client // here, they are only available in Enterprise. if profile != nil || len(profiles) > 0 { fmt.Printf("\n* RBAC is only available in Teleport Enterprise\n") - fmt.Printf(" https://gravitational.com/teleport/docs/enterprise\n") + fmt.Printf(" https://goteleport.com/teleport/docs/enterprise\n") } }