fix(agent): redo directory structure so test/build work

Author: ayuskauskas

.github/workflows/build_agent_container.yaml

@@ -53,7 +53,9 @@ jobs:
           cd agent
           export TAGS="-t ${REGISTRY@L}/${{env.IMAGE_NAME}}/agent:${{ github.sha }}"
           export REGISTRY=${REGISTRY@L}
-          make docker-build-only
+          # Get the last tag and use it as the env var AGENT_VERSION if it doesn't exist use 0.0.0+{github.sha}
+          export AGENT_VERSION=$(git describe --tags --abbrev=0 2>/dev/null || echo "0.0.0+${{ github.sha }}")
+          make docker-build-only agent_version=${AGENT_VERSION}
         env:
           AGENT_IMAGE: ${{env.IMAGE_NAME}}/agent
 

agent/Makefile

@@ -27,7 +27,6 @@ help: ## Display this help.
 venv: ## Sets up a python venv at `./venv`
 	python3 -m venv venv
 	$(VENV)pip install hatch coverage
-	$(VENV)hatch config set dirs.project "[\"${PWD}\"]"
 
 ##@ Test
 .PHONY: test
@@ -46,14 +45,14 @@ format:
 
 ##@ Build
 .PHONY: build
-build: ## Builds using hatch to `skyhook-agent/dist`
-	$(VENV)hatch -p skyhook-agent version ${1:unkown}
-	$(VENV)hatch -p skyhook-agent build -c
+build: ## Builds using hatch to `dist`
+	$(VENV)hatch version $(build_version)
+	$(VENV)hatch build -c
 
 ##@ Publish
 .PHONY: publish
 publish: ## Publishes using hatch
-	$(VENV)hatch -p skyhook-agent publish
+	$(VENV)hatch publish
 
 BUILD_ARGS ?= 
 ifndef GITLAB_CI
@@ -70,7 +69,7 @@ ACTUAL_TAGS=$(shell echo "-t $(REGISTRY)/$(AGENT_IMAGE):$(shell date +%y.%m.%d-%
 .PHONY: docker-build-only
 docker-build-only:
 	@echo "Building skyhook-agent docker image with tags: $(ACTUAL_TAGS)"
-	docker buildx build $(BUILD_ARGS) --platform linux/amd64,linux/arm64 $(ACTUAL_TAGS) -f docker/Dockerfile .
+	docker buildx build $(BUILD_ARGS) --build-arg AGENT_VERSION=$(AGENT_VERSION) --platform linux/amd64,linux/arm64 $(ACTUAL_TAGS) -f docker/Dockerfile .
 
 ##@ Docker Build
 .PHONY: docker-build

agent/docker/Dockerfile

@@ -1,14 +1,14 @@
-FROM python:3.10-alpine as builder
+FROM python:3.12-alpine as builder
 
-ARG CI_COMMIT_TAG:-0.0.0
+ARG AGENT_VERSION:-0.0.0
 
 COPY . /code
 WORKDIR /code
 RUN apk add bash make
 RUN make venv
-RUN make build ${CI_COMMIT_TAG}
+RUN make build build_version=${AGENT_VERSION}
 
-FROM python:3.10-alpine
+FROM python:3.12-alpine
 
 RUN mkdir -p /skyhook-agent-wheels
 COPY --from=builder /code/skyhook-agent/dist/* /skyhook-agent-wheels

agent/hatch.toml

@@ -1,3 +1,5 @@
+mode = "local"
+
 [envs.default]
 dependencies = [
   "coverage[toml]",
@@ -16,7 +18,7 @@ cov = [
 ]
 
 [[envs.all.matrix]]
-python = ["3.8", "3.9", "3.10"]
+python = ["3.12"]
 
 [envs.lint]
 detached = true
@@ -40,6 +42,3 @@ all = [
   "style",
   "typing",
 ]
-
-[version]
-source = "vcs"

agent/testing/path agent/skyhook-agent/LICENSE.txtagent/testing/path renamed to agent/skyhook-agent/LICENSE.txt

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["hatchling", "hatch-vcs"]
+requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [project]
@@ -34,6 +34,7 @@ Source = "https://github.com/nvidia.com/skyhook"
 [project.scripts]
 controller = "skyhook_agent.controller:cli"
 
+
 [tool.hatch.version]
 path = "src/skyhook_agent/__about__.py"
 
@@ -61,8 +62,8 @@ omit = [
 ]
 
 [tool.coverage.paths]
-skyhook_agent = ["src/skyhook_agent", "*/skyhook-agent/src/skyhook_agent"]
-tests = ["tests", "*/skyhook-agent/tests"]
+skyhook_agent = ["src/skyhook_agent", "*/src/skyhook_agent"]
+tests = ["tests", "*/tests"]
 
 [tool.coverage.report]
 exclude_lines = [

agent/skyhook-agent/README.md

@@ -1,4 +1,4 @@
 #  SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #  SPDX-License-Identifier: Apache-2.0
 #
-__version__ = "0.0.6"
+__version__ = "0.0.0"