Merge 23d8ef2 into 81047d1

Author: nao1215

.github/workflows/linux_test.yml

@@ -39,7 +39,14 @@ jobs:
       - name: Download dependencies
         run: go mod download
 
+      - name: Set up AWS config and AWS credentials
+        run: |
+          mkdir -p "$HOME/.aws"
+          echo -e "[default]\naws_access_key_id=test\naws_secret_access_key=test" > "$HOME/.aws/credentials"
+          echo -e  "[default]\nregion=us-east-1\noutput=json\nendpoint_url=http://localhost:4566" > "$HOME/.aws/config"
+
       - uses: nao1215/actions-hottest@v1
         with:
           args: '-cover -coverpkg=./... -coverprofile=coverage.out ./...'
+
       - uses: k1LoW/octocov-action@v0

.github/workflows/mac_test.yml

@@ -20,7 +20,6 @@ linters:
     - asciicheck
     - bodyclose
     - dogsled
-    - dupl
     - durationcheck
     - errorlint
     - exhaustive

.github/workflows/windows_test.yml

@@ -3,8 +3,6 @@
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 ![Coverage](https://raw.githubusercontent.com/nao1215/octocovs-central-repo/main/badges/nao1215/rainbow/coverage.svg)
 [![LinuxUnitTest](https://github.com/nao1215/rainbow/actions/workflows/linux_test.yml/badge.svg)](https://github.com/nao1215/rainbow/actions/workflows/linux_test.yml)
-[![WindowsUnitTest](https://github.com/nao1215/rainbow/actions/workflows/windows_test.yml/badge.svg)](https://github.com/nao1215/rainbow/actions/workflows/windows_test.yml)
-[![MacUnitTest](https://github.com/nao1215/rainbow/actions/workflows/mac_test.yml/badge.svg)](https://github.com/nao1215/rainbow/actions/workflows/mac_test.yml)
 [![reviewdog](https://github.com/nao1215/rainbow/actions/workflows/reviewdog.yml/badge.svg)](https://github.com/nao1215/rainbow/actions/workflows/reviewdog.yml)
 [![Gosec](https://github.com/nao1215/rainbow/actions/workflows/security.yml/badge.svg)](https://github.com/nao1215/rainbow/actions/workflows/security.yml)
 [![Go Report Card](https://goreportcard.com/badge/github.com/nao1215/rainbow)](https://goreportcard.com/report/github.com/nao1215/rainbow)

.golangci.yml

@@ -1,9 +1,23 @@
-// Package service is an abstraction layer for accessing external services.
-package service
+// Package domain implements the domain layer. This package is used only for application domain.
+package domain
 
 import "errors"
 
 var (
+	// ErrInvalidRegion is an error that occurs when the region is invalid.
+	ErrInvalidRegion = errors.New("invalid region")
+	// ErrEmptyRegion is an error that occurs when the region is empty.
+	ErrEmptyRegion = errors.New("region is empty")
+	// ErrInvalidBucketName is an error that occurs when the bucket name is invalid.
+	ErrInvalidBucketName = errors.New("bucket name is invalid")
+	// ErrNoSuchBucket is an error that occurs when the bucket does not exist.
+	ErrNoSuchBucket = errors.New("the specified bucket does not exist")
+	// ErrInvalidDomain is an error that occurs when the domain is invalid.
+	ErrInvalidDomain = errors.New("invalid domain")
+	// ErrNotDetectContentType is an error that occurs when the content type cannot be detected.
+	ErrNotDetectContentType = errors.New("failed to detect content type")
+	// ErrInvalidEndpoint is an error that occurs when the endpoint is invalid.
+	ErrInvalidEndpoint = errors.New("invalid endpoint")
 	// ErrBucketAlreadyExistsOwnedByOther is an error that occurs when the bucket already exists and is owned by another account.
 	ErrBucketAlreadyExistsOwnedByOther = errors.New("bucket already exists and is owned by another account")
 	// ErrBucketAlreadyOwnedByYou is an error that occurs when the bucket already exists and is owned by you.
@@ -16,8 +30,6 @@ var (
 	ErrCDNAlreadyExists = errors.New("CDN already exists")
 	// ErrOriginAccessIdentifyAlreadyExists is an error that occurs when the origin access identify already exists.
 	ErrOriginAccessIdentifyAlreadyExists = errors.New("origin access identify already exists")
-	// ErrNotDetectContentType is an error that occurs when the content type cannot be detected.
-	ErrNotDetectContentType = errors.New("failed to detect content type")
 	// ErrFileUpload is an error that occurs when the file upload fails.
 	ErrFileUpload = errors.New("failed to upload file")
 )

README.md

@@ -6,6 +6,7 @@ import (
 	"net/url"
 	"strings"
 
+	"github.com/nao1215/rainbow/app/domain"
 	"github.com/nao1215/rainbow/utils/errfmt"
 )
 
@@ -22,7 +23,7 @@ func (d Domain) String() string {
 func (d Domain) Validate() error {
 	for _, part := range strings.Split(d.String(), ".") {
 		if !isAlphaNumeric(part) {
-			return errfmt.Wrap(ErrInvalidDomain, fmt.Sprintf("domain %s is invalid", d))
+			return errfmt.Wrap(domain.ErrInvalidDomain, fmt.Sprintf("domain %s is invalid", d))
 		}
 	}
 	return nil
@@ -80,16 +81,16 @@ func (e Endpoint) String() string {
 // Validate validates Endpoint. If Endpoint is invalid, it returns an error.
 func (e Endpoint) Validate() error {
 	if e == "" {
-		return errfmt.Wrap(ErrInvalidEndpoint, "endpoint is empty")
+		return errfmt.Wrap(domain.ErrInvalidEndpoint, "endpoint is empty")
 	}
 
 	parsedURL, err := url.Parse(e.String())
 	if err != nil {
-		return errfmt.Wrap(ErrInvalidDomain, err.Error())
+		return errfmt.Wrap(domain.ErrInvalidDomain, err.Error())
 	}
 	host := parsedURL.Host
 	if host == "" || parsedURL.Scheme == "" {
-		return errfmt.Wrap(ErrInvalidDomain, host)
+		return errfmt.Wrap(domain.ErrInvalidDomain, host)
 	}
 	return nil
 }

app/domain/service/errors.go renamed to app/domain/errors.go

@@ -3,6 +3,8 @@ package model
 import (
 	"errors"
 	"testing"
+
+	"github.com/nao1215/rainbow/app/domain"
 )
 
 const (
@@ -53,7 +55,7 @@ func TestDomainValidate(t *testing.T) {
 		{
 			name:    "failure. protocol is included",
 			d:       exampleComWithProtocol,
-			wantErr: ErrInvalidDomain,
+			wantErr: domain.ErrInvalidDomain,
 		},
 		{
 			name:    "success. domain is empty",

app/domain/model/domain.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
+	"github.com/nao1215/rainbow/app/domain"
 	"github.com/nao1215/rainbow/utils/errfmt"
 	"github.com/nao1215/rainbow/utils/xregex"
 	"github.com/wailsapp/mimetype"
@@ -122,9 +123,9 @@ func (r Region) Validate() error {
 		RegionSASouth1, RegionUSGovEast1, RegionUSGovWest1:
 		return nil
 	case Region(""):
-		return ErrEmptyRegion
+		return domain.ErrEmptyRegion
 	default:
-		return ErrInvalidRegion
+		return domain.ErrInvalidRegion
 	}
 }
 
@@ -235,7 +236,7 @@ func (b Bucket) Split() (Bucket, S3Key) {
 // Bucket naming rules: https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html
 func (b Bucket) Validate() error {
 	if b.Empty() {
-		return errfmt.Wrap(ErrInvalidBucketName, "s3 bucket name is empty")
+		return errfmt.Wrap(domain.ErrInvalidBucketName, "s3 bucket name is empty")
 	}
 
 	validators := []func() error{
@@ -267,7 +268,7 @@ var s3RegexPattern xregex.Regex //nolint:gochecknoglobals
 func (b Bucket) validatePattern() error {
 	s3RegexPattern.InitOnce(`^[a-z0-9][a-z0-9.-]*[a-z0-9]$`)
 	if err := s3RegexPattern.MatchString(string(b)); err != nil {
-		return errfmt.Wrap(ErrInvalidBucketName, "s3 bucket name must use only lowercase letters, numbers, periods, and hyphens")
+		return errfmt.Wrap(domain.ErrInvalidBucketName, "s3 bucket name must use only lowercase letters, numbers, periods, and hyphens")
 	}
 	return nil
 }
@@ -276,7 +277,7 @@ func (b Bucket) validatePattern() error {
 func (b Bucket) validatePrefix() error {
 	for _, prefix := range []string{"xn--", "sthree-", "sthree-configurator"} {
 		if strings.HasPrefix(string(b), prefix) {
-			return errfmt.Wrap(ErrInvalidBucketName, "s3 bucket name must not start with \"xn--\", \"sthree-\", or \"sthree-configurator\"")
+			return errfmt.Wrap(domain.ErrInvalidBucketName, "s3 bucket name must not start with \"xn--\", \"sthree-\", or \"sthree-configurator\"")
 		}
 	}
 	return nil
@@ -286,7 +287,7 @@ func (b Bucket) validatePrefix() error {
 func (b Bucket) validateSuffix() error {
 	for _, suffix := range []string{"-s3alias", "--ol-s3"} {
 		if strings.HasSuffix(string(b), suffix) {
-			return errfmt.Wrap(ErrInvalidBucketName, "s3 bucket name must not end with \"-s3alias\" or \"--ol-s3\"")
+			return errfmt.Wrap(domain.ErrInvalidBucketName, "s3 bucket name must not end with \"-s3alias\" or \"--ol-s3\"")
 		}
 	}
 	return nil
@@ -295,7 +296,7 @@ func (b Bucket) validateSuffix() error {
 // validateCharSequence validates the character sequence of the bucket name.
 func (b Bucket) validateCharSequence() error {
 	if strings.Contains(string(b), "..") || strings.Contains(string(b), "--") {
-		return errfmt.Wrap(ErrInvalidBucketName, "s3 bucket name must not contain consecutive periods or hyphens")
+		return errfmt.Wrap(domain.ErrInvalidBucketName, "s3 bucket name must not contain consecutive periods or hyphens")
 	}
 	return nil
 }

app/domain/model/domain_test.go

@@ -15,6 +15,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
+	"github.com/nao1215/rainbow/app/domain"
 )
 
 func TestRegionString(t *testing.T) {
@@ -61,13 +62,13 @@ func TestRegionValidate(t *testing.T) {
 			name:    "failure. region is empty",
 			r:       Region(""),
 			wantErr: true,
-			e:       ErrEmptyRegion,
+			e:       domain.ErrEmptyRegion,
 		},
 		{
 			name:    "failure. region is invalid",
 			r:       Region("invalid"),
 			wantErr: true,
-			e:       ErrInvalidRegion,
+			e:       domain.ErrInvalidRegion,
 		},
 	}
 

app/domain/model/errors.go

@@ -1,4 +1,4 @@
-// Package service
+// Package service implements the service layer. This package is used only for application domain.
 package service
 
 import (

app/domain/model/s3.go

@@ -12,6 +12,7 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/aws/aws-sdk-go-v2/service/s3/types"
 	"github.com/google/wire"
+	"github.com/nao1215/rainbow/app/domain"
 	"github.com/nao1215/rainbow/app/domain/model"
 	"github.com/nao1215/rainbow/app/domain/service"
 )
@@ -59,6 +60,14 @@ func (c *S3BucketCreator) CreateS3Bucket(ctx context.Context, input *service.S3B
 		CreateBucketConfiguration: locationContstraint,
 	})
 	if err != nil {
+		var alreadyExistsErr *types.BucketAlreadyExists
+		var alreadyOwnedByYouErr *types.BucketAlreadyOwnedByYou
+		if errors.As(err, &alreadyExistsErr) {
+			return nil, fmt.Errorf("%w: region=%s, bucket name=%s", domain.ErrBucketAlreadyExistsOwnedByOther, input.Region.String(), input.Bucket.String())
+		}
+		if errors.As(err, &alreadyOwnedByYouErr) {
+			return nil, fmt.Errorf("%w: region=%s, bucket name=%s", domain.ErrBucketAlreadyOwnedByYou, input.Region.String(), input.Bucket.String())
+		}
 		return nil, fmt.Errorf("%w: region=%s, bucket name=%s", err, input.Region.String(), input.Bucket.String())
 	}
 	return &service.S3BucketCreatorOutput{}, nil
@@ -91,7 +100,7 @@ func (c *S3BucketLister) ListS3Buckets(ctx context.Context, _ *service.S3BucketL
 		return nil, err
 	}
 
-	var buckets model.BucketSets
+	buckets := make(model.BucketSets, 0, len(out.Buckets))
 	for _, b := range out.Buckets {
 		buckets = append(buckets, model.BucketSet{
 			Bucket:       model.Bucket(*b.Name),
@@ -127,6 +136,10 @@ func (c *S3BucketLocationGetter) GetS3BucketLocation(ctx context.Context, input
 		Bucket: aws.String(input.Bucket.String()),
 	})
 	if err != nil {
+		var noSuchBucket *types.NoSuchBucket
+		if errors.As(err, &noSuchBucket) {
+			return nil, fmt.Errorf("%w: bucket name=%s", domain.ErrNoSuchBucket, input.Bucket.String())
+		}
 		return nil, err
 	}
 
@@ -170,6 +183,10 @@ func (c *S3BucketDeleter) DeleteS3Bucket(ctx context.Context, input *service.S3B
 			o.Region = input.Region.String()
 		})
 	if err != nil {
+		var noSuchBucket *types.NoSuchBucket
+		if errors.As(err, &noSuchBucket) {
+			return nil, fmt.Errorf("%w: bucket name=%s", domain.ErrNoSuchBucket, input.Bucket.String())
+		}
 		return nil, err
 	}
 	return &service.S3BucketDeleterOutput{}, nil