Merge pull request #75 from grafana/move-internal-tools

Move cmd/alloy-service to internal/cmd/alloy-service

.drone/pipelines/build_images.jsonnet

@@ -4,7 +4,7 @@ local secrets = import '../util/secrets.jsonnet';
 local locals = {
   on_merge: {
     ref: ['refs/heads/main'],
-    paths: { include: ['build-image/**'] },
+    paths: { include: ['tools/build-image/**'] },
   },
   on_build_image_tag: {
     event: ['tag'],
@@ -36,7 +36,7 @@ local locals = {
         'docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD',
         'docker run --rm --privileged multiarch/qemu-user-static --reset -p yes',
         'docker buildx create --name multiarch --driver docker-container --use',
-        'docker buildx build --build-arg="GO_RUNTIME=golang:1.22.1-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/agent-build-image:$IMAGE_TAG ./build-image',
+        'docker buildx build --build-arg="GO_RUNTIME=golang:1.22.1-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/agent-build-image:$IMAGE_TAG ./tools/build-image',
       ],
     }],
     volumes: [{
@@ -59,7 +59,7 @@ local locals = {
         'docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD',
         'docker run --rm --privileged multiarch/qemu-user-static --reset -p yes',
         'docker buildx create --name multiarch --driver docker-container --use',
-        'docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.1-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/agent-build-image:$IMAGE_TAG ./build-image',
+        'docker buildx build --build-arg="GO_RUNTIME=mcr.microsoft.com/oss/go/microsoft/golang:1.22.1-bullseye" --push --platform linux/amd64,linux/arm64 -t grafana/agent-build-image:$IMAGE_TAG ./tools/build-image',
       ],
     }],
     volumes: [{
@@ -83,7 +83,7 @@ local locals = {
         // and not by Windows (where the syntax obviously wouldn't work).
         '$IMAGE_TAG="${DRONE_TAG##build-image/v}-windows"',
         'docker login -u $Env:DOCKER_LOGIN -p $Env:DOCKER_PASSWORD',
-        'docker build -t grafana/agent-build-image:$IMAGE_TAG ./build-image/windows',
+        'docker build -t grafana/agent-build-image:$IMAGE_TAG ./tools/build-image/windows',
         'docker push grafana/agent-build-image:$IMAGE_TAG',
       ],
     }],

.github/workflows/check-linux-build-image.yml

@@ -3,7 +3,7 @@ name: Check Linux build image
 on:
   pull_request:
     paths:
-      - 'build-image/*'
+      - 'tools/build-image/*'
 
 jobs:
   check-linux-build-image:
@@ -21,7 +21,7 @@ jobs:
       - name: Create test Linux build image
         uses: docker/build-push-action@v5
         with:
-          context: ./build-image
+          context: ./tools/build-image
           push: false
           tags: grafana/alloy-build-image:latest
           build-args: |
@@ -30,7 +30,7 @@ jobs:
       - name: Create test Linux build image for boring crypto
         uses: docker/build-push-action@v5
         with:
-          context: ./build-image
+          context: ./tools/build-image
           push: false
           tags: grafana/alloy-build-image:latest
           build-args: |

.github/workflows/check-windows-build-image.yml

@@ -3,7 +3,7 @@ name: Check Windows build image
 on:
   pull_request:
     paths:
-      - 'build-image/windows/**'
+      - 'tools/build-image/windows/**'
 
 jobs:
   check-windows-build-image:
@@ -19,4 +19,4 @@ jobs:
           tags: latest
           registry: docker.io
           pushImage: false
-          dockerfile: ./build-image/windows/Dockerfile
+          dockerfile: ./tools/build-image/windows/Dockerfile

Makefile

@@ -23,7 +23,7 @@
 ##
 ##   binaries                        Compiles all binaries.
 ##   alloy                           Compiles cmd/alloy to $(ALLOY_BINARY)
-##   alloy-service                   Compiles cmd/alloy-service to $(SERVICE_BINARY)
+##   alloy-service                   Compiles internal/cmd/alloy-service to $(SERVICE_BINARY)
 ##
 ## Targets for building Docker images:
 ##
@@ -166,7 +166,7 @@ alloy-service:
 ifeq ($(USE_CONTAINER),1)
 	$(RERUN_IN_CONTAINER)
 else
-	$(GO_ENV) go build $(GO_FLAGS) -o $(SERVICE_BINARY) ./cmd/alloy-service
+	$(GO_ENV) go build $(GO_FLAGS) -o $(SERVICE_BINARY) ./internal/cmd/alloy-service
 endif
 
 alloylint:

packaging/alloy/windows/install_script.nsis

@@ -70,7 +70,7 @@ Section "install"
   Exists:
     SetOutPath "$INSTDIR"
 
-  File "..\..\..\dist.temp\alloy-windows-amd64.exe"
+  File "..\..\..\dist\alloy-windows-amd64.exe"
   File "..\..\..\dist.temp\alloy-service-windows-amd64.exe"
   File "logo.ico"