From 308c17feb54a6be99c750c2d68b020ebde7f294c Mon Sep 17 00:00:00 2001 From: Ichinose Shogo Date: Sat, 3 Oct 2020 10:07:14 +0900 Subject: [PATCH] fix: staticcheck warnings in events/codebuild.go (#323) Co-authored-by: Bryan Moffatt --- .golangci.yml | 9 --------- events/codebuild.go | 36 ++++++++++++++++++------------------ 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 89b77ebd..2ef79fc3 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -17,12 +17,3 @@ run: skip-files: # These were code-generated, and cannot be changed without breaking RPC compatibility. - lambda/messages/*.go - - # FIXME - # events/codebuild.go:18:2: SA9004: only the first constant in this group has an explicit type (staticcheck) - # CodeBuildPhaseStatusFailed CodeBuildPhaseStatus = "FAILED" - # ^ - # events/codebuild.go:31:2: SA9004: only the first constant in this group has an explicit type (staticcheck) - # CodeBuildPhaseTypeSubmitted CodeBuildPhaseType = "SUBMITTED" - # ^ - - events/codebuild.go diff --git a/events/codebuild.go b/events/codebuild.go index bdd1b92c..ed60f84f 100644 --- a/events/codebuild.go +++ b/events/codebuild.go @@ -16,12 +16,12 @@ type CodeBuildPhaseStatus string const ( CodeBuildPhaseStatusFailed CodeBuildPhaseStatus = "FAILED" - CodeBuildPhaseStatusFault = "FAULT" - CodeBuildPhaseStatusInProgress = "IN_PROGRESS" - CodeBuildPhaseStatusQueued = "QUEUED" - CodeBuildPhaseStatusStopped = "STOPPED" - CodeBuildPhaseStatusSucceeded = "SUCCEEDED" - CodeBuildPhaseStatusTimedOut = "TIMED_OUT" + CodeBuildPhaseStatusFault CodeBuildPhaseStatus = "FAULT" + CodeBuildPhaseStatusInProgress CodeBuildPhaseStatus = "IN_PROGRESS" + CodeBuildPhaseStatusQueued CodeBuildPhaseStatus = "QUEUED" + CodeBuildPhaseStatusStopped CodeBuildPhaseStatus = "STOPPED" + CodeBuildPhaseStatusSucceeded CodeBuildPhaseStatus = "SUCCEEDED" + CodeBuildPhaseStatusTimedOut CodeBuildPhaseStatus = "TIMED_OUT" ) // CodeBuildPhaseType represents the type of the code build phase (i.e. submitted, install) @@ -29,16 +29,16 @@ type CodeBuildPhaseType string const ( CodeBuildPhaseTypeSubmitted CodeBuildPhaseType = "SUBMITTED" - CodeBuildPhaseTypeQueued = "QUEUED" - CodeBuildPhaseTypeProvisioning = "PROVISIONING" - CodeBuildPhaseTypeDownloadSource = "DOWNLOAD_SOURCE" - CodeBuildPhaseTypeInstall = "INSTALL" - CodeBuildPhaseTypePreBuild = "PRE_BUILD" - CodeBuildPhaseTypeBuild = "BUILD" - CodeBuildPhaseTypePostBuild = "POST_BUILD" - CodeBuildPhaseTypeUploadArtifacts = "UPLOAD_ARTIFACTS" - CodeBuildPhaseTypeFinalizing = "FINALIZING" - CodeBuildPhaseTypeCompleted = "COMPLETED" + CodeBuildPhaseTypeQueued CodeBuildPhaseType = "QUEUED" + CodeBuildPhaseTypeProvisioning CodeBuildPhaseType = "PROVISIONING" + CodeBuildPhaseTypeDownloadSource CodeBuildPhaseType = "DOWNLOAD_SOURCE" + CodeBuildPhaseTypeInstall CodeBuildPhaseType = "INSTALL" + CodeBuildPhaseTypePreBuild CodeBuildPhaseType = "PRE_BUILD" + CodeBuildPhaseTypeBuild CodeBuildPhaseType = "BUILD" + CodeBuildPhaseTypePostBuild CodeBuildPhaseType = "POST_BUILD" + CodeBuildPhaseTypeUploadArtifacts CodeBuildPhaseType = "UPLOAD_ARTIFACTS" + CodeBuildPhaseTypeFinalizing CodeBuildPhaseType = "FINALIZING" + CodeBuildPhaseTypeCompleted CodeBuildPhaseType = "COMPLETED" ) // CodeBuildEvent is documented at: @@ -81,12 +81,12 @@ type CodeBuildEventDetail struct { ProjectName string `json:"project-name"` BuildID string `json:"build-id"` AdditionalInformation CodeBuildEventAdditionalInformation `json:"additional-information"` - CurrentPhase CodeBuildPhaseStatus `json:"current-phase"` + CurrentPhase CodeBuildPhaseType `json:"current-phase"` CurrentPhaseContext string `json:"current-phase-context"` Version string `json:"version"` CompletedPhaseStatus CodeBuildPhaseStatus `json:"completed-phase-status"` - CompletedPhase CodeBuildPhaseStatus `json:"completed-phase"` + CompletedPhase CodeBuildPhaseType `json:"completed-phase"` CompletedPhaseContext string `json:"completed-phase-context"` CompletedPhaseDuration DurationSeconds `json:"completed-phase-duration-seconds"` CompletedPhaseStart CodeBuildTime `json:"completed-phase-start"`