Skip to content

Commit

Permalink
Update GitHub references to crossplane-contrib
Browse files Browse the repository at this point in the history
Signed-off-by: arielsepton <[email protected]>
  • Loading branch information
arielsepton committed Feb 29, 2024
1 parent d645d6a commit 5a30cce
Show file tree
Hide file tree
Showing 29 changed files with 96 additions and 99 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Setup Project

PROJECT_NAME := provider-http
PROJECT_REPO := github.com/arielsepton/$(PROJECT_NAME)
PROJECT_REPO := github.com/crossplane-contrib/$(PROJECT_NAME)

PLATFORMS ?= linux_amd64 linux_arm64

Expand Down
18 changes: 9 additions & 9 deletions PROVIDER_CHECKLIST.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Generally projects are named `provider-<name>`, with `name` being the API being
managed. Example project names are `provider-aws`, `provider-kubernetes`,
and `provider-github`.

The [provider-http](https://github.com/arielsepton/provider-http) repository can be
The [provider-http](https://github.com/crossplane-contrib/provider-http) repository can be
used as a starting point for new providers. For [terrajet](https://github.com/crossplane/terrajet)-based providers, the
[provider-jet-http](https://github.com/crossplane-contrib/provider-jet-http) is
available.
Expand All @@ -43,17 +43,17 @@ Most Crossplane providers include the following files:
[provider-gcp/README.md](https://github.com/crossplane/provider-gcp/blob/master/README.md)
as an example)
- [ ] Code is licensed under the [Apache 2.0
License](https://github.com/arielsepton/provider-http/blob/main/LICENSE)
License](https://github.com/crossplane-contrib/provider-http/blob/main/LICENSE)
- [ ] Include a “Developer Certificate of Origin”. Example:
[DCO](https://github.com/upbound/build/blob/master/DCO)
- [ ] Include the CNCF [Code of
Conduct](https://github.com/crossplane/crossplane/blob/master/CODE_OF_CONDUCT.md)
- [ ] Update
[OWNERS.md](https://github.com/arielsepton/provider-http/blob/main/OWNERS.md)
[OWNERS.md](https://github.com/crossplane-contrib/provider-http/blob/main/OWNERS.md)
with contacts for project Owners
- [ ] Ensure `hack/boilerplate.go.txt` (used in Code generation) includes
Crossplane Authors, Apache license and any other Copyright statements:
[https://github.com/arielsepton/provider-http/blob/main/hack/boilerplate.go.txt](https://github.com/arielsepton/provider-http/blob/main/hack/boilerplate.go.txt)
[https://github.com/crossplane-contrib/provider-http/blob/main/hack/boilerplate.go.txt](https://github.com/crossplane-contrib/provider-http/blob/main/hack/boilerplate.go.txt)
- [ ] Include Documentation on how to:
- [ ] Install Provider
- [ ] Contribute to Development
Expand All @@ -68,7 +68,7 @@ There are a number of build tools and processes that are common across the
Crossplane ecosystem. Using these ensures a consistent development environment
across projects.

The [provider-http](https://github.com/arielsepton/provider-http)
The [provider-http](https://github.com/crossplane-contrib/provider-http)
repository contains most of these settings.

- [ ] Use the [Upbound build](https://github.com/upbound/build) submodule. (see
Expand All @@ -81,7 +81,7 @@ repository contains most of these settings.
- [ ] Create a [Crossplane
Package](https://crossplane.io/docs/master/concepts/packages.html)
configuration (see
[package/crossplane.yaml)](https://github.com/arielsepton/provider-http/blob/main/package/crossplane.yaml)
[package/crossplane.yaml)](https://github.com/crossplane-contrib/provider-http/blob/main/package/crossplane.yaml)

## Deployment of Artifacts

Expand All @@ -96,7 +96,7 @@ the publish and promotion workflows.
In general, providers should:

- [ ] Utilize GitHub workflows from
<https://github.com/arielsepton/provider-http/tree/main/.github/workflows>
<https://github.com/crossplane-contrib/provider-http/tree/main/.github/workflows>
- [ ] Create OCI image repos to push Package and Controller images.
- [ ] Automatically push Provider images and packages via CI
- [ ] Add GitHub Secrets to push to Docker repository. (To be performed by
Expand All @@ -113,6 +113,6 @@ to grant your project access to the GitHub org scoped secrets.
- [ ] Follow recommendations at
[https://github.com/crossplane/crossplane/blob/master/GOVERNANCE.md#repository-governance](https://github.com/crossplane/crossplane/blob/master/GOVERNANCE.md#repository-governance)
- [ ] Enable Issues on your project and configure Issue https (examples at:
[.github/ISSUE_TEMPLATE](https://github.com/arielsepton/provider-http/tree/master/.github/ISSUE_TEMPLATE))
[.github/ISSUE_TEMPLATE](https://github.com/crossplane-contrib/provider-http/tree/master/.github/ISSUE_TEMPLATE))
- [ ] Create Pull Request Https: (example:
[PULL_REQUEST_TEMPLATE.md](https://github.com/arielsepton/provider-http/blob/master/.github/PULL_REQUEST_TEMPLATE.md))
[PULL_REQUEST_TEMPLATE.md](https://github.com/crossplane-contrib/provider-http/blob/master/.github/PULL_REQUEST_TEMPLATE.md))
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ To install `provider-http`, you have two options:
1. Using the Crossplane CLI in a Kubernetes cluster where Crossplane is installed:

```console
kubectl crossplane install provider ghcr.io/arielsepton/provider-http:v1.2.0
kubectl crossplane install provider xpkg.upbound.io/crossplane-contrib/provider-http:v0.1.0
```

2. Manually creating a Provider by applying the following YAML:
Expand All @@ -21,7 +21,7 @@ To install `provider-http`, you have two options:
metadata:
name: provider-http
spec:
package: "ghcr.io/arielsepton/provider-http:v1.2.0"
package: "xpkg.upbound.io/crossplane-contrib/provider-http:v0.1.0"
```


Expand Down
6 changes: 3 additions & 3 deletions apis/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ package apis
import (
"k8s.io/apimachinery/pkg/runtime"

desposiblerequestv1alpha1 "github.com/arielsepton/provider-http/apis/desposiblerequest/v1alpha1"
requestv1alpha1 "github.com/arielsepton/provider-http/apis/request/v1alpha1"
httpv1alpha1 "github.com/arielsepton/provider-http/apis/v1alpha1"
desposiblerequestv1alpha1 "github.com/crossplane-contrib/provider-http/apis/desposiblerequest/v1alpha1"
requestv1alpha1 "github.com/crossplane-contrib/provider-http/apis/request/v1alpha1"
httpv1alpha1 "github.com/crossplane-contrib/provider-http/apis/v1alpha1"
)

func init() {
Expand Down
4 changes: 2 additions & 2 deletions cmd/provider/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import (
"github.com/crossplane/crossplane-runtime/pkg/logging"
"github.com/crossplane/crossplane-runtime/pkg/ratelimiter"

"github.com/arielsepton/provider-http/apis"
template "github.com/arielsepton/provider-http/internal/controller"
"github.com/crossplane-contrib/provider-http/apis"
template "github.com/crossplane-contrib/provider-http/internal/controller"
)

func main() {
Expand Down
25 changes: 2 additions & 23 deletions deploy.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# HTTP_PROVIDER
# provider-http
apiVersion: pkg.crossplane.io/v1
kind: Provider
metadata:
name: http-provider
spec:
package: ghcr.io/arielsepton/provider-http:v1.0.1
package: xpkg.upbound.io/crossplane-contrib/provider-http:v0.1.0
controllerConfigRef:
name: debug-config

Expand All @@ -18,24 +18,3 @@ metadata:
spec:
args:
- --debug


---
# PROVIDER_HELM
apiVersion: pkg.crossplane.io/v1
kind: Provider
metadata:
name: provider-helm
spec:
package: xpkg.upbound.io/crossplane-contrib/provider-helm:v0.15.0


---
# PROVIDER_CONFIG_HELM_PROVIDER
apiVersion: helm.crossplane.io/v1beta1
kind: ProviderConfig
metadata:
name: helm-provider
spec:
credentials:
source: InjectedIdentity
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/arielsepton/provider-http
module github.com/crossplane-contrib/provider-http

go 1.19

Expand Down
6 changes: 3 additions & 3 deletions hack/helpers/controller/KIND_LOWER/KIND_LOWER.go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ import (
"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
"github.com/crossplane/crossplane-runtime/pkg/resource"

"github.com/arielsepton/provider-{{ .Env.PROVIDER | strings.ToLower }}/apis/{{ .Env.GROUP | strings.ToLower }}/{{ .Env.APIVERSION | strings.ToLower }}"
apisv1alpha1 "github.com/arielsepton/provider-{{ .Env.PROVIDER | strings.ToLower }}/apis/v1alpha1"
"github.com/arielsepton/provider-{{ .Env.PROVIDER | strings.ToLower }}/internal/controller/features"
"github.com/crossplane-contrib/provider-{{ .Env.PROVIDER | strings.ToLower }}/apis/{{ .Env.GROUP | strings.ToLower }}/{{ .Env.APIVERSION | strings.ToLower }}"
apisv1alpha1 "github.com/crossplane-contrib/provider-{{ .Env.PROVIDER | strings.ToLower }}/apis/v1alpha1"
"github.com/crossplane-contrib/provider-{{ .Env.PROVIDER | strings.ToLower }}/internal/controller/features"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/crossplane/crossplane-runtime/pkg/reconciler/providerconfig"
"github.com/crossplane/crossplane-runtime/pkg/resource"

"github.com/arielsepton/provider-http/apis/v1alpha1"
"github.com/crossplane-contrib/provider-http/apis/v1alpha1"
)

// Setup adds a controller that reconciles ProviderConfigs by accounting for
Expand Down
12 changes: 6 additions & 6 deletions internal/controller/desposiblerequest/desposiblerequest.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@ import (
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/arielsepton/provider-http/internal/jq"
json_util "github.com/arielsepton/provider-http/internal/json"
"github.com/crossplane-contrib/provider-http/internal/jq"
json_util "github.com/crossplane-contrib/provider-http/internal/json"
xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
"github.com/crossplane/crossplane-runtime/pkg/controller"
"github.com/crossplane/crossplane-runtime/pkg/event"
"github.com/crossplane/crossplane-runtime/pkg/ratelimiter"
"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
"github.com/crossplane/crossplane-runtime/pkg/resource"

"github.com/arielsepton/provider-http/apis/desposiblerequest/v1alpha1"
apisv1alpha1 "github.com/arielsepton/provider-http/apis/v1alpha1"
httpClient "github.com/arielsepton/provider-http/internal/clients/http"
"github.com/arielsepton/provider-http/internal/utils"
"github.com/crossplane-contrib/provider-http/apis/desposiblerequest/v1alpha1"
apisv1alpha1 "github.com/crossplane-contrib/provider-http/apis/v1alpha1"
httpClient "github.com/crossplane-contrib/provider-http/internal/clients/http"
"github.com/crossplane-contrib/provider-http/internal/utils"
)

const (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"testing"
"time"

"github.com/arielsepton/provider-http/apis/desposiblerequest/v1alpha1"
"github.com/crossplane-contrib/provider-http/apis/desposiblerequest/v1alpha1"

httpClient "github.com/arielsepton/provider-http/internal/clients/http"
"github.com/arielsepton/provider-http/internal/utils"
httpClient "github.com/crossplane-contrib/provider-http/internal/clients/http"
"github.com/crossplane-contrib/provider-http/internal/utils"
xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
"github.com/google/go-cmp/cmp"
"github.com/pkg/errors"
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"github.com/crossplane/crossplane-runtime/pkg/controller"
ctrl "sigs.k8s.io/controller-runtime"

"github.com/arielsepton/provider-http/internal/controller/config"
desposiblerequest "github.com/arielsepton/provider-http/internal/controller/desposiblerequest"
request "github.com/arielsepton/provider-http/internal/controller/request"
"github.com/crossplane-contrib/provider-http/internal/controller/config"
desposiblerequest "github.com/crossplane-contrib/provider-http/internal/controller/desposiblerequest"
request "github.com/crossplane-contrib/provider-http/internal/controller/request"
)

// Setup creates all http controllers with the supplied logger and adds them to
Expand Down
10 changes: 5 additions & 5 deletions internal/controller/request/observe.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"net/http"
"strings"

"github.com/arielsepton/provider-http/apis/request/v1alpha1"
httpClient "github.com/arielsepton/provider-http/internal/clients/http"
"github.com/arielsepton/provider-http/internal/controller/request/requestgen"
"github.com/arielsepton/provider-http/internal/json"
"github.com/arielsepton/provider-http/internal/utils"
"github.com/crossplane-contrib/provider-http/apis/request/v1alpha1"
httpClient "github.com/crossplane-contrib/provider-http/internal/clients/http"
"github.com/crossplane-contrib/provider-http/internal/controller/request/requestgen"
"github.com/crossplane-contrib/provider-http/internal/json"
"github.com/crossplane-contrib/provider-http/internal/utils"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions internal/controller/request/observe_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"net/http"
"testing"

"github.com/arielsepton/provider-http/apis/request/v1alpha1"
httpClient "github.com/arielsepton/provider-http/internal/clients/http"
"github.com/crossplane-contrib/provider-http/apis/request/v1alpha1"
httpClient "github.com/crossplane-contrib/provider-http/internal/clients/http"
"github.com/crossplane/crossplane-runtime/pkg/logging"
"github.com/crossplane/crossplane-runtime/pkg/test"
"github.com/google/go-cmp/cmp"
Expand Down
12 changes: 6 additions & 6 deletions internal/controller/request/request.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ import (
"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
"github.com/crossplane/crossplane-runtime/pkg/resource"

"github.com/arielsepton/provider-http/apis/request/v1alpha1"
apisv1alpha1 "github.com/arielsepton/provider-http/apis/v1alpha1"
httpClient "github.com/arielsepton/provider-http/internal/clients/http"
"github.com/arielsepton/provider-http/internal/controller/request/requestgen"
"github.com/arielsepton/provider-http/internal/controller/request/statushandler"
"github.com/arielsepton/provider-http/internal/utils"
"github.com/crossplane-contrib/provider-http/apis/request/v1alpha1"
apisv1alpha1 "github.com/crossplane-contrib/provider-http/apis/v1alpha1"
httpClient "github.com/crossplane-contrib/provider-http/internal/clients/http"
"github.com/crossplane-contrib/provider-http/internal/controller/request/requestgen"
"github.com/crossplane-contrib/provider-http/internal/controller/request/statushandler"
"github.com/crossplane-contrib/provider-http/internal/utils"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/request/request_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/controller-runtime/pkg/client"

"github.com/arielsepton/provider-http/apis/request/v1alpha1"
httpClient "github.com/arielsepton/provider-http/internal/clients/http"
"github.com/crossplane-contrib/provider-http/apis/request/v1alpha1"
httpClient "github.com/crossplane-contrib/provider-http/internal/clients/http"
xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
"github.com/crossplane/crossplane-runtime/pkg/logging"
"github.com/crossplane/crossplane-runtime/pkg/resource"
Expand Down
8 changes: 4 additions & 4 deletions internal/controller/request/requestgen/request_generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (

"github.com/pkg/errors"

"github.com/arielsepton/provider-http/apis/request/v1alpha1"
"github.com/arielsepton/provider-http/internal/controller/request/requestprocessing"
json_util "github.com/arielsepton/provider-http/internal/json"
"github.com/arielsepton/provider-http/internal/utils"
"github.com/crossplane-contrib/provider-http/apis/request/v1alpha1"
"github.com/crossplane-contrib/provider-http/internal/controller/request/requestprocessing"
json_util "github.com/crossplane-contrib/provider-http/internal/json"
"github.com/crossplane-contrib/provider-http/internal/utils"

"golang.org/x/exp/maps"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package requestgen
import (
"testing"

"github.com/arielsepton/provider-http/apis/request/v1alpha1"
"github.com/crossplane-contrib/provider-http/apis/request/v1alpha1"
"github.com/crossplane/crossplane-runtime/pkg/logging"
"github.com/crossplane/crossplane-runtime/pkg/test"
"github.com/google/go-cmp/cmp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"strings"

"github.com/arielsepton/provider-http/internal/jq"
"github.com/crossplane-contrib/provider-http/internal/jq"
)

func ConvertStringToJQQuery(input string) string {
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/request/responseconverter/converter.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package responseconverter

import (
"github.com/arielsepton/provider-http/apis/request/v1alpha1"
httpClient "github.com/arielsepton/provider-http/internal/clients/http"
"github.com/crossplane-contrib/provider-http/apis/request/v1alpha1"
httpClient "github.com/crossplane-contrib/provider-http/internal/clients/http"
)

// Convert HttpResponse to Response
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package responseconverter
import (
"testing"

"github.com/arielsepton/provider-http/apis/request/v1alpha1"
httpClient "github.com/arielsepton/provider-http/internal/clients/http"
"github.com/crossplane-contrib/provider-http/apis/request/v1alpha1"
httpClient "github.com/crossplane-contrib/provider-http/internal/clients/http"
"github.com/google/go-cmp/cmp"
)

Expand Down
10 changes: 5 additions & 5 deletions internal/controller/request/statushandler/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"net/http"
"strconv"

"github.com/arielsepton/provider-http/apis/request/v1alpha1"
httpClient "github.com/arielsepton/provider-http/internal/clients/http"
"github.com/arielsepton/provider-http/internal/controller/request/requestgen"
"github.com/arielsepton/provider-http/internal/controller/request/responseconverter"
"github.com/arielsepton/provider-http/internal/utils"
"github.com/crossplane-contrib/provider-http/apis/request/v1alpha1"
httpClient "github.com/crossplane-contrib/provider-http/internal/clients/http"
"github.com/crossplane-contrib/provider-http/internal/controller/request/requestgen"
"github.com/crossplane-contrib/provider-http/internal/controller/request/responseconverter"
"github.com/crossplane-contrib/provider-http/internal/utils"
"github.com/crossplane/crossplane-runtime/pkg/logging"
"github.com/pkg/errors"
"k8s.io/apimachinery/pkg/types"
Expand Down
6 changes: 3 additions & 3 deletions internal/controller/request/statushandler/status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (

"github.com/pkg/errors"

"github.com/arielsepton/provider-http/apis/request/v1alpha1"
httpClient "github.com/arielsepton/provider-http/internal/clients/http"
"github.com/arielsepton/provider-http/internal/utils"
"github.com/crossplane-contrib/provider-http/apis/request/v1alpha1"
httpClient "github.com/crossplane-contrib/provider-http/internal/clients/http"
"github.com/crossplane-contrib/provider-http/internal/utils"
"github.com/crossplane/crossplane-runtime/pkg/logging"
"github.com/crossplane/crossplane-runtime/pkg/test"
"github.com/google/go-cmp/cmp"
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/request/utils.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package request

import (
"github.com/arielsepton/provider-http/apis/request/v1alpha1"
"github.com/crossplane-contrib/provider-http/apis/request/v1alpha1"
)

func getMappingByMethod(requestParams *v1alpha1.RequestParameters, method string) (*v1alpha1.Mapping, bool) {
Expand Down
2 changes: 1 addition & 1 deletion internal/controller/request/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package request
import (
"testing"

"github.com/arielsepton/provider-http/apis/request/v1alpha1"
"github.com/crossplane-contrib/provider-http/apis/request/v1alpha1"
"github.com/google/go-cmp/cmp"
)

Expand Down
Loading

0 comments on commit 5a30cce

Please sign in to comment.