Skip to content

config/validator/s3bucket: remove TNC references #285

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Sep 19, 2018
Merged

config/validator/s3bucket: remove TNC references #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pkg/types/config/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func (c *Cluster) validateAWS() []error {
if err := c.validateAWSEndpoints(); err != nil {
errs = append(errs, err)
}
if err := c.validateTNCS3Bucket(); err != nil {
if err := c.validateS3Bucket(); err != nil {
errs = append(errs, err)
}
if err := validate.PrefixError("aws vpcCIDRBlock", validate.SubnetCIDR(c.AWS.VPCCIDRBlock)); err != nil {
Expand Down Expand Up @@ -235,12 +235,12 @@ func (c *Cluster) validateAWSEndpoints() error {
}
}

// validateTNCS3Bucket does some basic validation to ensure that the TNC bucket
// validateS3Bucket does some basic validation to ensure that the S3 bucket
// matches the S3 bucket naming rules. Not all rules are checked
// because Tectonic controls the generation of S3 bucket names, creating
// buckets of the form: <cluster-name>-<tnc>.<domain-name>
func (c *Cluster) validateTNCS3Bucket() error {
bucket := fmt.Sprintf("%s-tnc.%s", c.Name, c.BaseDomain)
// buckets of the form: <cluster-name>.<domain-name>
func (c *Cluster) validateS3Bucket() error {
bucket := fmt.Sprintf("%s.%s", c.Name, c.BaseDomain)
if len(bucket) > maxS3BucketNameLength {
return fmt.Errorf("the S3 bucket name %q, generated from the cluster name and base domain, is too long; S3 bucket names must be less than 63 characters; please choose a shorter cluster name or base domain", bucket)
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/types/config/validate_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ func TestAWSEndpoints(t *testing.T) {
}
}

func TestTNCS3BucketNames(t *testing.T) {
func TestS3BucketNames(t *testing.T) {
cases := []struct {
cluster Cluster
err bool
Expand Down Expand Up @@ -395,7 +395,7 @@ func TestTNCS3BucketNames(t *testing.T) {
}

for i, c := range cases {
if err := c.cluster.validateTNCS3Bucket(); (err != nil) != c.err {
if err := c.cluster.validateS3Bucket(); (err != nil) != c.err {
no := "no"
if c.err {
no = "an"
Expand Down