chore: Cleanup (#7)

* chore: Cleanup

* chore: Add temp tag

* Add test .fleetControl for CI testing

* chore: Use testing tag

Author: mvicknr

.fleetControl/agentControl/agent-schema-for-agent-control.yml

@@ -0,0 +1,57 @@
+namespace: newrelic
+name: com.newrelic.my_agent
+version: 0.1.0
+variables:
+  k8s:
+    version:
+      description: "My Agent init container version"
+      type: string
+      default: "latest"
+      required: false
+    podLabelSelector:
+      description: "Pod label selector"
+      type: yaml
+      default: { }
+      required: false
+    namespaceLabelSelector:
+      description: "Namespace label selector"
+      type: yaml
+      default: { }
+      required: false
+    env:
+      description: "environment variables to pass to My agent"
+      type: yaml
+      default: [ ]
+      required: false
+    health_env:
+      description: "environment variables to pass to health sidecar"
+      type: yaml
+      default: [ ]
+      required: false
+    health_version:
+      description: "health sidecar image version"
+      type: string
+      default: "latest"
+      required: false
+deployment:
+  k8s:
+    health:
+      interval: 30s
+      initial_delay: 30s
+    objects:
+      instrumentation:
+        apiVersion: newrelic.com/v1beta1
+        kind: Instrumentation
+        metadata:
+          name: ${nr-sub:agent_id}
+          namespace: ${nr-ac:namespace_agents}
+        spec:
+          agent:
+            language: My
+            image: newrelic/newrelic-myagent-init:${nr-var:version}
+            env: ${nr-var:env}
+          healthAgent:
+            image: newrelic/k8s-apm-agent-health-sidecar:${nr-var:health_version}
+            env: ${nr-var:health_env}
+          podLabelSelector: ${nr-var:podLabelSelector}
+          namespaceLabelSelector: ${nr-var:namespaceLabelSelector}

.fleetControl/configurationDefinitions.yml

@@ -0,0 +1,13 @@
+configurationDefinitions:
+  - platform: kubernetes
+    description: myagent agent configuration, provided by the user
+    type: myagent-config
+    version: 1.0.0
+    format: json
+    schema: ./schemas/myagent-config.json
+  - platform: host
+    description: myagent agent configuration, provided by the user
+    type: myagent-config
+    version: 1.0.0
+    format: json
+    schema: ./schemas/myagent-config.json

.fleetControl/schemas/myagent-config.json

@@ -0,0 +1,75 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://newrelic.com/schemas/myagent-configuration.json",
+  "title": "New Relic My Agent Configuration Schema",
+  "version": "1.0.0",
+  "description": "Schema for New Relic My Agent configuration",
+  "type": "object",
+  "properties": {
+    "common": {
+      "type": "object",
+      "description": "Common configuration settings shared across all environments",
+      "properties": {
+        "license_key": {
+          "type": "string",
+          "minLength": 1,
+          "description": "New Relic license key",
+          "examples": ["<%= license_key %>", "your_license_key_here"]
+        },
+        "agent_enabled": {
+          "type": "boolean",
+          "description": "Enable or disable the agent",
+          "default": true
+        },
+        "app_name": {
+          "type": "string",
+          "minLength": 1,
+          "description": "Application name as it will appear in New Relic",
+          "examples": ["My Application"]
+        },
+        "log_level": {
+          "type": "string",
+          "enum": ["debug", "info", "warn", "error"],
+          "description": "Log level for the agent"
+        },
+        "host": {
+          "type": "string",
+          "description": "New Relic collector host"
+        },
+        "labels": {
+          "type": "string",
+          "description": "Semicolon-separated list of key:value labels",
+          "examples": ["Environment:Production;Team:Platform"]
+        }
+      },
+      "required": ["license_key", "app_name"],
+      "additionalProperties": false
+    },
+    "development": {
+      "type": "object",
+      "description": "Development environment specific configuration",
+      "additionalProperties": true
+    },
+    "test": {
+      "type": "object",
+      "description": "Test environment specific configuration",
+      "additionalProperties": true
+    },
+    "production": {
+      "type": "object",
+      "description": "Production environment specific configuration",
+      "additionalProperties": true
+    },
+    "staging": {
+      "type": "object",
+      "description": "Staging environment specific configuration",
+      "additionalProperties": true
+    }
+  },
+  "required": ["common"],
+  "additionalProperties": {
+    "type": "object",
+    "description": "Custom environment configuration",
+    "additionalProperties": true
+  }
+}

.github/workflows/test_action.yml

@@ -13,45 +13,73 @@ jobs:
     name: Test Agent Repository Flow
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup test files
-        run: ln -s integration-test/agent-flow/.fleetControl .fleetControl
+      - name: Checkout action repository
+        uses: actions/checkout@v4
 
       - name: Run Agent Metadata Action (with configs)
         uses: ./
         with:
           agent-type: 'myagent'
-          version: '1.0.0'
+          version: '0.0.0'
           cache: false
 
   test-docs-flow:
     name: Test Documentation Flow (MDX Parsing)
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
+      - name: Checkout action repository
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v4
         with:
-          fetch-depth: 0  # Fetch all history for git diff
+          go-version-file: 'go.mod'
+          cache: true
 
-      - name: Create mock PR event
+      - name: Build action
+        run: go build -o agent-metadata-action ./cmd/agent-metadata-action
+
+      - name: Setup temporary workspace with MDX files
         run: |
-          BASE_SHA=$(git rev-parse origin/main 2>/dev/null || git rev-parse main)
+          # Create a temporary directory for the test workspace
+          TEMP_WORKSPACE="${{ runner.temp }}/test-workspace"
+          mkdir -p "$TEMP_WORKSPACE"
+
+          # Initialize git repo in temp workspace
+          cd "$TEMP_WORKSPACE"
+          git init
+          git config user.email "[email protected]"
+          git config user.name "Test User"
+
+          # Create base commit (without MDX files)
+          mkdir -p src/content/docs/release-notes
+          git commit --allow-empty -m "Initial commit"
+          BASE_SHA=$(git rev-parse HEAD)
+
+          # Copy integration-test MDX files and commit them
+          cp -r "${{ github.workspace }}/integration-test/docs-flow/"* .
+          git add .
+          git commit -m "Add release notes"
+          HEAD_SHA=$(git rev-parse HEAD)
+
+          # Create mock PR event
           cat > /tmp/pr-event.json <<EOF
           {
             "pull_request": {
               "base": {"sha": "${BASE_SHA}"},
-              "head": {"sha": "${{ github.sha }}"}
+              "head": {"sha": "${HEAD_SHA}"}
             }
           }
           EOF
 
+          echo "BASE_SHA: $BASE_SHA"
+          echo "HEAD_SHA: $HEAD_SHA"
+          echo "TEMP_WORKSPACE=$TEMP_WORKSPACE" >> $GITHUB_ENV
+
       - name: Run Agent Metadata Action (metadata from MDX)
-        uses: ./
-        with:
-          agent-type: 'myagent'
-          version: '1.3.0'
-          cache: false
         env:
           GITHUB_EVENT_PATH: '/tmp/pr-event.json'
+          GITHUB_WORKSPACE: ${{ env.TEMP_WORKSPACE }}
+        run: |
+          cd ${{ env.TEMP_WORKSPACE }}
+          ${{ github.workspace }}/agent-metadata-action