Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/generate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
go-version-file: go.mod

- name: Install Task
uses: arduino/setup-task@v2
uses: go-task/setup-task@v2
with:
version: 3.x

Expand Down
16 changes: 1 addition & 15 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/setup-python@v6
with:
cache: pip
python-version: 3.x
- run: pip install -r requirements.txt
- uses: actions/setup-go@v6
with:
go-version-file: go.mod
- uses: golangci/golangci-lint-action@v9
with:
version: latest
install-only: true
- run: go install golang.org/x/tools/cmd/goimports@latest
- uses: actions/cache@v5
with:
path: ~/.cache/pre-commit
key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
- run: pre-commit run --all-files
- uses: j178/prek-action@v2
6 changes: 3 additions & 3 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ jobs:
release-please:
runs-on: ubuntu-latest
steps:
- uses: actions/create-github-app-token@v2
- uses: actions/create-github-app-token@v3
id: app-token
with:
app-id: ${{ secrets.APP_ID }}
private-key: ${{ secrets.APP_PRIVATE_KEY }}
app-id: ${{ secrets.DEVSY_GITHUB_APP_ID }}
private-key: ${{ secrets.DEVSY_GITHUB_APP_PRIVATE_KEY }}
- uses: googleapis/release-please-action@v4
id: release
with:
Expand Down
9 changes: 7 additions & 2 deletions .github/workflows/workflow-approval.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@ jobs:
name: Approve Workflows
runs-on: ubuntu-latest
steps:
- uses: mheap/automatic-approve-action@v1
- uses: actions/create-github-app-token@v3
id: app-token
with:
token: ${{ secrets.GH_ACCESS_TOKEN }}
app-id: ${{ secrets.DEVSY_GITHUB_APP_ID }}
private-key: ${{ secrets.DEVSY_GITHUB_APP_PRIVATE_KEY }}
- uses: skevetter/automatic-approve-action@v1
with:
token: ${{ steps.app-token.outputs.token }}
workflows: "commit.yml,lint.yml,pre-commit.yml"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# admin-apis

Go library providing shared API types and license definitions for the [DevPod](https://github.com/skevetter/devpod) ecosystem.
Go library providing shared API types and license definitions for the [Devsy](https://github.com/devsy-org/devsy) ecosystem.

## Prerequisites

Expand Down
2 changes: 1 addition & 1 deletion definitions/features.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ features:
module: "devsy-pro-distro"
description: "Isolated Control Plane optimizes resource allocation and security by splitting up the control plane and worker Devsy into separate clusters. "
docsLink: "https://www.vcluster.com/docs/vcluster/configure/vcluster-yaml/experimental/isolated-control-plane"
- name: "devpod"
- name: "devsy"
displayName: "Dev Environment Management"
module: "dev-environments"
preview: true
4 changes: 2 additions & 2 deletions definitions/generated/modules_generated.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ modules:
name: deployment-modes
- displayName: Dev Environments
features:
- devpod
- devsy
limits:
- displayName: Dev Environments
name: devpod-workspace-instance
name: devsy-workspace-instance
name: dev-environments
- displayName: Devsy
features:
Expand Down
2 changes: 1 addition & 1 deletion definitions/modules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,5 @@ modules:
- name: "dev-environments"
displayName: "Dev Environments"
limits:
- name: devpod-workspace-instance
- name: devsy-workspace-instance
displayName: "Dev Environments"
6 changes: 3 additions & 3 deletions pkg/licenseapi/features.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ const (

DevsyDistroIsolatedControlPlane FeatureName = "devsy-distro-isolated-cp" // Isolated Control Plane

Devpod FeatureName = "devpod" // Dev Environment Management
Devsy FeatureName = "devsy" // Dev Environment Management

)

Expand Down Expand Up @@ -223,7 +223,7 @@ func GetFeatures() []FeatureName {
SecretEncryption,
DevsyDistroAdmissionControl,
DevsyDistroIsolatedControlPlane,
Devpod,
Devsy,
}
}

Expand Down Expand Up @@ -586,7 +586,7 @@ func GetAllFeatures() []*Feature {
},
{
DisplayName: "Dev Environment Management",
Name: "devpod",
Name: "devsy",
Module: "dev-environments",
},
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/licenseapi/license_limit.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ var Limits = map[ResourceName]*Limit{
DisplayName: "Virtual Clusters (HA)",
Name: string(DevsyClusterInstanceHALimit),
},
DevPodWorkspaceInstanceLimit: {
DevsyWorkspaceInstanceLimit: {
DisplayName: "Dev Environments",
Name: string(DevPodWorkspaceInstanceLimit),
Name: string(DevsyWorkspaceInstanceLimit),
},
UserLimit: {
DisplayName: "Users",
Expand Down
20 changes: 9 additions & 11 deletions pkg/licenseapi/names.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,8 @@ const (
// Products
const (
/* NEVER CHANGE ANY OF THESE */
Devsy ProductName = "devsy"
DevsyPro ProductName = "devsy-pro"
DevPodPro ProductName = "devpod-pro"
DevsyOrg ProductName = "devsy"
DevsyPro ProductName = "devsy-pro"
)

// Modules
Expand All @@ -47,7 +46,6 @@ const (
KubernetesClusterModule ModuleName = "k8s-clusters"
DevsyModule ModuleName = "devsy"
DevsyProDistroModule ModuleName = "devsy-pro-distro"
DevPodModule ModuleName = "devpod"
AuthModule ModuleName = "auth"
TemplatingModule ModuleName = "templating"
SecretsModule ModuleName = "secrets"
Expand Down Expand Up @@ -78,13 +76,13 @@ const (
// Resources (e.g. for limits)
const (
/* NEVER CHANGE ANY OF THESE */
ConnectedClusterLimit ResourceName = "connected-cluster"
DevsyClusterInstanceLimit ResourceName = "virtual-cluster-instance"
DevsyClusterInstanceHALimit ResourceName = "virtual-cluster-instance-ha"
SpaceInstanceLimit ResourceName = "space-instance"
DevPodWorkspaceInstanceLimit ResourceName = "devpod-workspace-instance"
UserLimit ResourceName = "user"
InstanceLimit ResourceName = "instance"
ConnectedClusterLimit ResourceName = "connected-cluster"
DevsyClusterInstanceLimit ResourceName = "virtual-cluster-instance"
DevsyClusterInstanceHALimit ResourceName = "virtual-cluster-instance-ha"
SpaceInstanceLimit ResourceName = "space-instance"
DevsyWorkspaceInstanceLimit ResourceName = "devsy-workspace-instance"
UserLimit ResourceName = "user"
InstanceLimit ResourceName = "instance"
)

// Resource Status
Expand Down
2 changes: 1 addition & 1 deletion pkg/licenseapi/request_instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const (
type InstanceCreateInput struct {
*InstanceTokenAuth `json:",inline" hash:"-"`

// Product is the product that is being used. Can be empty, devsy, devpod-pro or devsy-pro.
// Product is the product that is being used. Can be empty, devsy or devsy-pro.
// This should NOT be a ProductName but a string to allow for downward compatibility
Product string `json:"product,omitempty" form:"product"`

Expand Down
2 changes: 1 addition & 1 deletion pkg/licenseapi/zz_generated.openapi.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading