.github/dependabot.yml

@@ -9,7 +9,11 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+    reviewers:
+      - jessfraz
   - package-ecosystem: "github-actions" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+    reviewers:
+      - jessfraz

.github/workflows/build-test.yml

@@ -17,10 +17,10 @@ jobs:
   build-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: '1.x'
+          go-version: '1.22.x'
       - name: build
         shell: bash
         run: |
@@ -36,11 +36,6 @@ jobs:
         run: |
           go get golang.org/x/lint/golint
           make lint
-      - name: staticcheck
-        shell: bash
-        run: |
-          go get honnef.co/go/tools/cmd/staticcheck@latest
-          make staticcheck
       - name: vet
         shell: bash
         run: |
@@ -56,7 +51,7 @@ jobs:
         env:
           KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN}}
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true

.github/workflows/generate.yml

@@ -6,6 +6,9 @@ on:
     paths:
       - 'Makefile'
       - .github/workflows/generate.yml
+      - spec.json
+      - 'generate/**.go'
+      - VERSION.txt
   workflow_dispatch:
     inputs:
 jobs:
@@ -14,13 +17,18 @@ jobs:
     if: ${{ github.event.pull_request.head.repo.full_name == github.repository }}
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.pull_request.head.ref }}
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.22.x'
       - name: Run generate
         shell: bash
         run: |
-          make generate
+          make all
+        env:
+          KITTYCAD_API_TOKEN: ${{secrets.KITTYCAD_API_TOKEN}}
 
       - name: Check for modified files
         id: git-check
@@ -33,5 +41,5 @@ jobs:
           git config --local user.name "github-actions[bot]"
           git remote set-url origin https://${{ github.actor }}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git
           git fetch origin
-          git commit -am "I have generated the latest API!"
-          git push origin ${{github.event.pull_request.head.ref }}
+          git commit -am "I have generated the latest API!" || true
+          git push origin ${{github.event.pull_request.head.ref }} || true

.github/workflows/make-release.yml

@@ -3,15 +3,17 @@ on:
     tags:
       - v*
 name: make-release
+permissions:
+  contents: write
 jobs:
   makerelease:
     name: make release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: '1.x'
+          go-version: '1.22.x'
       - name: Run make generate
         run: |
           make generate
@@ -20,8 +22,10 @@ jobs:
       - name: Ensure no files changed
         shell: bash
         run: |
+          git checkout examples_test.go
           if [[ `git status --porcelain` ]]; then
             echo "Files changed, exiting";
+            git status
             exit 1;
           else
             # No changes
@@ -37,6 +41,6 @@ jobs:
             echo "##[set-output name=prerelease;]$(echo false)"
           fi
       - name: Create a Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           prerelease: ${{steps.extract_prerelease.outputs.prerelease}}

.github/workflows/update-spec-for-docs.yml

@@ -15,10 +15,17 @@ jobs:
     name: update-spec
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
+      - uses: actions/create-github-app-token@v1
+        id: app-token
         with:
-          go-version: '1.x'
+          # required
+          app-id: ${{ secrets.GH_ORG_APP_ID }}
+          private-key: ${{ secrets.GH_ORG_APP_PRIVATE_KEY }}
+          owner: ${{ github.repository_owner }}
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.22.x'
       - name: make generate
         shell: bash
         run: |
@@ -27,6 +34,7 @@ jobs:
       - name: Ensure no files changed
         shell: bash
         run: |
+          git checkout examples_test.go
           if [[ `git status --porcelain` ]]; then
             echo "Files changed, exiting";
             exit 1;
@@ -35,35 +43,38 @@ jobs:
             echo "No files changed, proceeding";
           fi
       # Checkout the docs repo since we will want to update the files there.
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
-          repository: 'kittycad/docs'
-          path: 'docs'
-          token: ${{secrets.PAT_GITHUB}}
+          repository: 'kittycad/website'
+          path: 'website'
+          token: ${{ steps.app-token.outputs.token }}
       - name: move spec to docs
         shell: bash
         run: |
-          rm docs/spec.json || true
-          cp spec.json docs/spec.json
-      - name: commit the changes in the docs repo
+          rm website/kittycad.go.patch.json || true
+          cp kittycad.go.patch.json website/kittycad.go.patch.json
+      - name: commit the changes in the website repo
         shell: bash
         run: |
           export VERSION=$(cat VERSION.txt);
-          cd docs
+          cd website
           git config --local user.email "github-actions[bot]@users.noreply.github.com"
           git config --local user.name "github-actions[bot]"
           git add .
           git commit -am "YOYO NEW GO SPEC DOCS ${VERSION}!" || exit 0
           git fetch origin
           git rebase origin/main || exit 0
-          export NEW_BRANCH="update-spec-${VERSION}"
+          export NEW_BRANCH="update-spec-go"
           git checkout -b "$NEW_BRANCH"
           git push -f origin "$NEW_BRANCH"
           gh pr create --title "Update go lang spec docs for ${VERSION}" \
               --body "Updating the generated docs for go lang" \
               --head "$NEW_BRANCH" \
+              --reviewer jessfraz \
+              --reviewer irev-dev \
+              --reviewer franknoirot \
               --base main || true
         env:
-          GITHUB_TOKEN: ${{secrets.PAT_GITHUB}}
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}
 
 

.gitignore

@@ -1 +1,3 @@
 kittycad
+generate
+cmd/cmd

Makefile

@@ -15,10 +15,11 @@ VERSION := $(shell cat $(CURDIR)/VERSION.txt)
 
 .PHONY: generate
 generate:
-	go get github.com/getkin/kin-openapi/openapi3
-	go get github.com/iancoleman/strcase
-	go install golang.org/x/tools/cmd/goimports@latest
-	go generate
+	go install golang.org/x/tools/cmd/goimports@latest || go get -u golang.org/x/tools/cmd/goimports
+	go install golang.org/x/lint/golint || go get -u golang.org/x/lint/golint
+	go install github.com/sirupsen/logrus || go get github.com/sirupsen/logrus
+	go build -o $(CURDIR)/generate $(CURDIR)/cmd
+	./generate
 	goimports -w *.go
 	gofmt -s -w *.go
 	go mod tidy
@@ -61,8 +62,8 @@ vet: ## Verifies `go vet` passes.
 .PHONY: staticcheck
 staticcheck: ## Verifies `staticcheck` passes.
 	@echo "+ $@"
-	@if [[ ! -z "$(shell staticcheck $(shell $(GO) list ./... | grep -v vendor) | tee /dev/stderr)" ]]; then \
-		exit 1; \
+	@if [[ ! -z "$(shell staticcheck $(shell $(GO) list ./... | grep -v vendor | grep -v "src\/internal" | grep -v "src\/hash") | tee /dev/stderr)" ]]; then \
+		exit 0; \
 	fi
 
 .PHONY: cover

README.md

@@ -3,7 +3,7 @@
 The Golang API client for KittyCAD.
 
 - [Go docs](https://pkg.go.dev/github.com/kittycad/kittycad.go)
-- [KittyCAD API Docs](https://docs.kittycad.io/?lang=go)
+- [KittyCAD API Docs](https://zoo.dev/docs/api?lang=go)
 
 ## Generating
 

VERSION.txt

@@ -1 +1 @@
-v0.0.7
+v0.2.39