Move builder to cmd/builder (open-telemetry#4307)

* Move builder to cmd/builder Signed-off-by: Juraci Paixão Kröhling <[email protected]> * Fix path to Makefile.Common Signed-off-by: Juraci Paixão Kröhling <[email protected]> * Fix versions.yaml entry for the builder Signed-off-by: Juraci Paixão Kröhling <[email protected]>
mantian2020 · Oct 29, 2021 · e168df5 · e168df5
1 parent 2981b3c
commit e168df5
Show file tree

Hide file tree

Showing 34 changed files with 18 additions and 19 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -15,7 +15,7 @@ updates:
     schedule:
       interval: "weekly"
   - package-ecosystem: "gomod"
-    directory: "/builder"
+    directory: "/cmd/builder"
     schedule:
       interval: "weekly"
   - package-ecosystem: "gomod"

diff --git a/.github/workflows/api-compatibility.yml b/.github/workflows/api-compatibility.yml
@@ -8,7 +8,7 @@ name: "Inform Incompatible PRs"
 on:
   pull_request:
     paths-ignore:
-      - 'builder/**'
+      - 'cmd/builder/**'
     branches:
       - main
 

diff --git a/.github/workflows/build-and-test-windows.yaml b/.github/workflows/build-and-test-windows.yaml
@@ -2,8 +2,6 @@ name: build-and-test-windows
 on:
   push:
     branches: [ main ]
-    paths-ignore:
-      - 'builder/**'
     tags:
       - 'v[0-9]+.[0-9]+.[0-9]+*'
   pull_request:

diff --git a/.github/workflows/check-links.yaml b/.github/workflows/check-links.yaml
@@ -3,10 +3,10 @@ on:
   push:
     branches: [ main ]
     paths-ignore:
-      - 'builder/**'
+      - 'cmd/builder/**'
   pull_request:
     paths-ignore:
-      - 'builder/**'
+      - 'cmd/builder/**'
 
 jobs:
   check-links:

diff --git a/builder/Makefile b/builder/Makefile
diff --git a/builder/.github/CODEOWNERS → cmd/builder/.github/CODEOWNERS b/builder/.github/CODEOWNERS → cmd/builder/.github/CODEOWNERS
diff --git a/builder/.github/mergify.yml → cmd/builder/.github/mergify.yml b/builder/.github/mergify.yml → cmd/builder/.github/mergify.yml
diff --git a/builder/.github/workflows/go.yaml → cmd/builder/.github/workflows/go.yaml b/builder/.github/workflows/go.yaml → cmd/builder/.github/workflows/go.yaml
diff --git a/...r/.github/workflows/integration-test.yaml → ...r/.github/workflows/integration-test.yaml b/...r/.github/workflows/integration-test.yaml → ...r/.github/workflows/integration-test.yaml
diff --git a/builder/.github/workflows/release.yml → cmd/builder/.github/workflows/release.yml b/builder/.github/workflows/release.yml → cmd/builder/.github/workflows/release.yml
@@ -25,5 +25,6 @@ jobs:
         with:
           version: latest
           args: release --rm-dist
+          workdir: cmd/builder
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/builder/.gitignore → cmd/builder/.gitignore b/builder/.gitignore → cmd/builder/.gitignore
diff --git a/builder/.goreleaser.yml → cmd/builder/.goreleaser.yml b/builder/.goreleaser.yml → cmd/builder/.goreleaser.yml
diff --git a/builder/LICENSE → cmd/builder/LICENSE b/builder/LICENSE → cmd/builder/LICENSE
diff --git a/cmd/builder/Makefile b/cmd/builder/Makefile
@@ -0,0 +1 @@
+include ../../Makefile.Common
diff --git a/builder/README.md → cmd/builder/README.md b/builder/README.md → cmd/builder/README.md
diff --git a/builder/RELEASE.md → cmd/builder/RELEASE.md b/builder/RELEASE.md → cmd/builder/RELEASE.md
diff --git a/builder/cmd/root.go → cmd/builder/cmd/root.go b/builder/cmd/root.go → cmd/builder/cmd/root.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd // import "go.opentelemetry.io/collector/builder/cmd"
+package cmd // import "go.opentelemetry.io/collector/cmd/builder/cmd"
 
 import (
 	"fmt"
@@ -21,7 +21,7 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 
-	"go.opentelemetry.io/collector/builder/internal/builder"
+	"go.opentelemetry.io/collector/cmd/builder/internal/builder"
 )
 
 var (
@@ -76,7 +76,7 @@ func Execute() error {
 	cmd.Flags().StringVar(&cfg.Distribution.OtelColVersion, "otelcol-version", cfg.Distribution.OtelColVersion, "Which version of OpenTelemetry Collector to use as base")
 	cmd.Flags().StringVar(&cfg.Distribution.OutputPath, "output-path", cfg.Distribution.OutputPath, "Where to write the resulting files")
 	cmd.Flags().StringVar(&cfg.Distribution.Go, "go", "", "The Go binary to use during the compilation phase. Default: go from the PATH")
-	cmd.Flags().StringVar(&cfg.Distribution.Module, "module", "go.opentelemetry.io/collector/builder", "The Go module for the new distribution")
+	cmd.Flags().StringVar(&cfg.Distribution.Module, "module", "go.opentelemetry.io/collector/cmd/builder", "The Go module for the new distribution")
 
 	// version of this binary
 	cmd.AddCommand(versionCmd)

diff --git a/builder/go.mod → cmd/builder/go.mod b/builder/go.mod → cmd/builder/go.mod
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-module go.opentelemetry.io/collector/builder
+module go.opentelemetry.io/collector/cmd/builder
 
 go 1.17
 

diff --git a/builder/go.sum → cmd/builder/go.sum b/builder/go.sum → cmd/builder/go.sum
diff --git a/builder/header.txt → cmd/builder/header.txt b/builder/header.txt → cmd/builder/header.txt
diff --git a/builder/internal/builder/config.go → cmd/builder/internal/builder/config.go b/builder/internal/builder/config.go → cmd/builder/internal/builder/config.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package builder // import "go.opentelemetry.io/collector/builder/internal/builder"
+package builder // import "go.opentelemetry.io/collector/cmd/builder/internal/builder"
 
 import (
 	"errors"

diff --git a/builder/internal/builder/config_test.go → cmd/builder/internal/builder/config_test.go b/builder/internal/builder/config_test.go → cmd/builder/internal/builder/config_test.go
diff --git a/builder/internal/builder/main.go → cmd/builder/internal/builder/main.go b/builder/internal/builder/main.go → cmd/builder/internal/builder/main.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package builder // import "go.opentelemetry.io/collector/builder/internal/builder"
+package builder // import "go.opentelemetry.io/collector/cmd/builder/internal/builder"
 
 import (
 	"errors"
@@ -23,7 +23,7 @@ import (
 	"text/template"
 	"time"
 
-	"go.opentelemetry.io/collector/builder/internal/scaffold"
+	"go.opentelemetry.io/collector/cmd/builder/internal/scaffold"
 )
 
 var (

diff --git a/builder/internal/scaffold/components.go → cmd/builder/internal/scaffold/components.go b/builder/internal/scaffold/components.go → cmd/builder/internal/scaffold/components.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package scaffold // import "go.opentelemetry.io/collector/builder/internal/scaffold"
+package scaffold // import "go.opentelemetry.io/collector/cmd/builder/internal/scaffold"
 
 const Components = `
 // Copyright 2020 OpenTelemetry Authors

diff --git a/builder/internal/scaffold/gomod.go → cmd/builder/internal/scaffold/gomod.go b/builder/internal/scaffold/gomod.go → cmd/builder/internal/scaffold/gomod.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package scaffold // import "go.opentelemetry.io/collector/builder/internal/scaffold"
+package scaffold // import "go.opentelemetry.io/collector/cmd/builder/internal/scaffold"
 
 const Gomod = `
 module {{.Distribution.Module}}

diff --git a/builder/internal/scaffold/main.go → cmd/builder/internal/scaffold/main.go b/builder/internal/scaffold/main.go → cmd/builder/internal/scaffold/main.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package scaffold // import "go.opentelemetry.io/collector/builder/internal/scaffold"
+package scaffold // import "go.opentelemetry.io/collector/cmd/builder/internal/scaffold"
 
 const Main = `
 // Copyright 2020 OpenTelemetry Authors

diff --git a/builder/main.go → cmd/builder/main.go b/builder/main.go → cmd/builder/main.go
@@ -18,7 +18,7 @@ import (
 	"fmt"
 	"os"
 
-	"go.opentelemetry.io/collector/builder/cmd"
+	"go.opentelemetry.io/collector/cmd/builder/cmd"
 )
 
 func main() {

diff --git a/builder/test/README.md → cmd/builder/test/README.md b/builder/test/README.md → cmd/builder/test/README.md
diff --git a/builder/test/nocore.builder.yaml → cmd/builder/test/nocore.builder.yaml b/builder/test/nocore.builder.yaml → cmd/builder/test/nocore.builder.yaml
diff --git a/builder/test/nocore.otel.yaml → cmd/builder/test/nocore.otel.yaml b/builder/test/nocore.otel.yaml → cmd/builder/test/nocore.otel.yaml
diff --git a/builder/test/replaces.builder.yaml → cmd/builder/test/replaces.builder.yaml b/builder/test/replaces.builder.yaml → cmd/builder/test/replaces.builder.yaml
diff --git a/builder/test/replaces.otel.yaml → cmd/builder/test/replaces.otel.yaml b/builder/test/replaces.otel.yaml → cmd/builder/test/replaces.otel.yaml
diff --git a/builder/test/test.sh → cmd/builder/test/test.sh b/builder/test/test.sh → cmd/builder/test/test.sh
diff --git a/versions.yaml b/versions.yaml
@@ -17,7 +17,7 @@ module-sets:
     version: v0.38.0
     modules:
       - go.opentelemetry.io/collector
+      - go.opentelemetry.io/collector/cmd/builder
       - go.opentelemetry.io/collector/model
-      - go.opentelemetry.io/collector/builder
 excluded-modules:
       - go.opentelemetry.io/collector/internal/tools