Skip to content

Commit

Permalink
💚 Fix "check-diff" build.
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesdobson committed Dec 27, 2024
1 parent ce43733 commit 85e1a23
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 51 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"ghcr.io/devcontainers-extra/features/tfswitch:1": {}
},

"onCreateCommand": "tfswitch -b /home/vscode/terraform 1.5.7 ; helm repo add jfrog https://charts.jfrog.io ; go install github.com/magefile/[email protected] ; go install github.com/onsi/ginkgo/v2/ginkgo",
"onCreateCommand": "tfswitch -b /home/vscode/terraform 1.5.7 ; helm repo add jfrog https://charts.jfrog.io ; go install github.com/magefile/[email protected] ; go install github.com/onsi/ginkgo/v2/ginkgo ; go install golang.org/x/tools/cmd/[email protected]",
"updateContentCommand": "go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$(grep -E '^GOLANGCILINT_VERSION[[:space:]]*\\?=[[:space:]]*[[:digit:][:punct:]]*' Makefile | cut -d'=' -f2 | tr -d '[:space:]')",
"remoteEnv": {
"PATH": "${containerEnv:PATH}:/home/vscode",
Expand Down
15 changes: 0 additions & 15 deletions apis/repository/v1alpha1/zz_generated.deepcopy.go

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

15 changes: 2 additions & 13 deletions apis/repository/v1alpha1/zz_genericrepository_types.go

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

2 changes: 1 addition & 1 deletion config/external_name.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import "github.com/crossplane/upjet/pkg/config"
// provider.
var ExternalNameConfigs = map[string]config.ExternalName{
// Import requires using a randomly generated ID from provider: nl-2e21sda
"artifactory_unmanaged_user": config.NameAsIdentifier,
// TODO: Not implemented yet: "artifactory_unmanaged_user": config.NameAsIdentifier,
"artifactory_local_generic_repository": config.ParameterAsIdentifier("key"),
}

Expand Down
3 changes: 2 additions & 1 deletion e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ var _ = Describe("E2E Tests", func() {
},
Spec: v1alpha1.GenericRepositorySpec{
ForProvider: v1alpha1.GenericRepositoryParameters{
Key: ptr.To("UNUSED-repo-key"),
Description: ptr.To("Test repository"),
},
ResourceSpec: v1.ResourceSpec{
ProviderConfigReference: &v1.Reference{
Expand Down Expand Up @@ -111,6 +111,7 @@ var _ = Describe("E2E Tests", func() {
err = rtClient.GetRepository("test-repo", &repoDetails)
Expect(err).NotTo(HaveOccurred())
Expect(repoDetails.Key).To(Equal("test-repo"))
Expect(repoDetails.Description).To(Equal("Test repository"))
Expect(repoDetails.GetRepoType()).To(Equal("local"))
Expect(repoDetails.PackageType).To(Equal("generic"))
})
Expand Down
20 changes: 0 additions & 20 deletions package/crds/repository.upbound.io_genericrepositories.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,6 @@ spec:
When used, only artifacts matching one of the include patterns
are served. By default, all artifacts are included (`**/*`).
type: string
key:
description: A mandatory identifier for the repository that must
be unique. Must be 1 - 64 alphanumeric and hyphen characters.
It cannot contain spaces or special characters.
type: string
notes:
description: Internal description.
type: string
Expand Down Expand Up @@ -200,11 +195,6 @@ spec:
When used, only artifacts matching one of the include patterns
are served. By default, all artifacts are included (`**/*`).
type: string
key:
description: A mandatory identifier for the repository that must
be unique. Must be 1 - 64 alphanumeric and hyphen characters.
It cannot contain spaces or special characters.
type: string
notes:
description: Internal description.
type: string
Expand Down Expand Up @@ -411,11 +401,6 @@ spec:
required:
- forProvider
type: object
x-kubernetes-validations:
- message: spec.forProvider.key is a required parameter
rule: '!(''*'' in self.managementPolicies || ''Create'' in self.managementPolicies
|| ''Update'' in self.managementPolicies) || has(self.forProvider.key)
|| (has(self.initProvider) && has(self.initProvider.key))'
status:
description: GenericRepositoryStatus defines the observed state of GenericRepository.
properties:
Expand Down Expand Up @@ -458,11 +443,6 @@ spec:
When used, only artifacts matching one of the include patterns
are served. By default, all artifacts are included (`**/*`).
type: string
key:
description: A mandatory identifier for the repository that must
be unique. Must be 1 - 64 alphanumeric and hyphen characters.
It cannot contain spaces or special characters.
type: string
notes:
description: Internal description.
type: string
Expand Down

0 comments on commit 85e1a23

Please sign in to comment.