Skip to content

Commit

Permalink
Merge pull request #355 from rawlingsj/main
Browse files Browse the repository at this point in the history
chore: move to plugins org
  • Loading branch information
jenkins-x-bot-test authored Mar 31, 2021
2 parents cd1586b + 7673af4 commit 774c685
Show file tree
Hide file tree
Showing 28 changed files with 63 additions and 59 deletions.
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ builds:
# Custom ldflags templates.
# Default is `-s -w -X main.version={{.Version}} -X main.commit={{.ShortCommit}} -X main.date={{.Date}} -X main.builtBy=goreleaser`.
ldflags:
- -X "github.com/jenkins-x/jx-promote/pkg/version.Version={{.Env.VERSION}}" -X "{{.Env.ROOTPACKAGE}}/pkg/version.Version={{.Env.VERSION}}" -X "{{.Env.ROOTPACKAGE}}/pkg/version.Revision={{.Env.REV}}" -X "{{.Env.ROOTPACKAGE}}/pkg/version.Branch={{.Env.BRANCH}}" -X "{{.Env.ROOTPACKAGE}}/pkg/version.BuildDate={{.Env.BUILDDATE}}" -X "{{.Env.ROOTPACKAGE}}/pkg/version.GoVersion={{.Env.GOVERSION}}"
- -X "github.com/jenkins-x-plugins/jx-promote/pkg/version.Version={{.Env.VERSION}}" -X "{{.Env.ROOTPACKAGE}}/pkg/version.Version={{.Env.VERSION}}" -X "{{.Env.ROOTPACKAGE}}/pkg/version.Revision={{.Env.REV}}" -X "{{.Env.ROOTPACKAGE}}/pkg/version.Branch={{.Env.BRANCH}}" -X "{{.Env.ROOTPACKAGE}}/pkg/version.BuildDate={{.Env.BUILDDATE}}" -X "{{.Env.ROOTPACKAGE}}/pkg/version.GoVersion={{.Env.GOVERSION}}"

# GOOS list to build for.
# For more info refer to: https://golang.org/doc/install/source#environment
Expand Down
2 changes: 1 addition & 1 deletion .jx/updatebot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ spec:
- https://github.com/jenkins-x/jx3-pipeline-catalog
changes:
- regex:
pattern: "ghcr.io/jenkins-x/jx-promote:(.*)"
pattern: "ghcr.io/jenkins-x-plugins/jx-promote:(.*)"
files:
- "**/*.yaml"
- urls:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
rwildcard=$(wildcard $1$2) $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2))

SHELL := /bin/bash
NAME := jx-project
NAME := jx-promote
BINARY_NAME := jx-promote
BUILD_TARGET = build
MAIN_SRC_FILE=cmd/main.go
GO := GO111MODULE=on go
GO_NOMOD :=GO111MODULE=off go
REV := $(shell git rev-parse --short HEAD 2> /dev/null || echo 'unknown')
ORG := jenkins-x
ORG := jenkins-x-plugins
ORG_REPO := $(ORG)/$(NAME)
RELEASE_ORG_REPO := $(ORG_REPO)
ROOT_PACKAGE := github.com/$(ORG_REPO)
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
# jx-promote

[![Documentation](https://godoc.org/github.com/jenkins-x/jx-promote?status.svg)](https://pkg.go.dev/mod/github.com/jenkins-x/jx-promote)
[![Go Report Card](https://goreportcard.com/badge/github.com/jenkins-x/jx-promote)](https://goreportcard.com/report/github.com/jenkins-x/jx-promote)
[![Releases](https://img.shields.io/github/release-pre/jenkins-x/helmboot.svg)](https://github.com/jenkins-x/jx-promote/releases)
[![LICENSE](https://img.shields.io/github/license/jenkins-x/helmboot.svg)](https://github.com/jenkins-x/jx-promote/blob/master/LICENSE)
[![Documentation](https://godoc.org/github.com/jenkins-x-plugins/jx-promote?status.svg)](https://pkg.go.dev/mod/github.com/jenkins-x-plugins/jx-promote)
[![Go Report Card](https://goreportcard.com/badge/github.com/jenkins-x-plugins/jx-promote)](https://goreportcard.com/report/github.com/jenkins-x-plugins/jx-promote)
[![Releases](https://img.shields.io/github/release-pre/jenkins-x/helmboot.svg)](https://github.com/jenkins-x-plugins/jx-promote/releases)
[![LICENSE](https://img.shields.io/github/license/jenkins-x/helmboot.svg)](https://github.com/jenkins-x-plugins/jx-promote/blob/master/LICENSE)
[![Slack Status](https://img.shields.io/badge/slack-join_chat-white.svg?logo=slack&style=social)](https://slack.k8s.io/)

`jx promote` is an experimental binary plugin to promote applications to a [Jenkins](https://jenkins.io/) environment

## Getting Started

Download the [jx-promote binary](https://github.com/jenkins-x/jx-promote/releases) for your operating system and add it to your `$PATH`.
Download the [jx-promote binary](https://github.com/jenkins-x-plugins/jx-promote/releases) for your operating system and add it to your `$PATH`.

There will be an `app` you can install soon too...

## Commands

See the [jx-promote command reference](https://github.com/jenkins-x/jx-promote/blob/master/docs/cmd/jx-promote.md#jx-promote)
See the [jx-promote command reference](https://github.com/jenkins-x-plugins/jx-promote/blob/master/docs/cmd/jx-promote.md#jx-promote)

## Promoting via the command line

Expand All @@ -33,7 +33,7 @@ The helm rule uses a helm chart's `requirements.yaml` file to manage dependent a

`jx promote` will detect the `env/requirements.yaml` file automatically without any explict configuration.

You can [explicitly configure](#rule-configuration) the helm rule by specifying the [helmRule](https://github.com/jenkins-x/jx-promote/blob/master/docs/config.md#promote.jenkins-x.io/v1alpha1.HelmRule) property on the [spec](https://github.com/jenkins-x/jx-promote/blob/master/docs/config.md#promote.jenkins-x.io/v1alpha1.PromoteSpec) of the [.jx/promote.yaml](https://github.com/jenkins-x/jx-promote/blob/master/docs/config.md#promote) configuration file like [this one](pkg/rules/factory/test_data/helm-explicit/.jx/promote.yaml#L4-L5):
You can [explicitly configure](#rule-configuration) the helm rule by specifying the [helmRule](https://github.com/jenkins-x-plugins/jx-promote/blob/master/docs/config.md#promote.jenkins-x.io/v1alpha1.HelmRule) property on the [spec](https://github.com/jenkins-x-plugins/jx-promote/blob/master/docs/config.md#promote.jenkins-x.io/v1alpha1.PromoteSpec) of the [.jx/promote.yaml](https://github.com/jenkins-x-plugins/jx-promote/blob/master/docs/config.md#promote) configuration file like [this one](pkg/rules/factory/test_data/helm-explicit/.jx/promote.yaml#L4-L5):

```yaml
apiVersion: promote.jenkins-x.io/v1alpha1
Expand All @@ -51,7 +51,7 @@ The apps rule uses a `jx-apps.yml` file to describe the charts to deploy in your
`jx promote` will detect the `jx-apps.yml` file in the root directory automatically without any explicit configuration.


You can [explicitly configure](#rule-configuration) the apps rule by creating a [.jx/promote.yaml](https://github.com/jenkins-x/jx-promote/blob/master/docs/config.md#promote) configuration file and specifying the [appsRule](https://github.com/jenkins-x/jx-promote/blob/master/docs/config.md#appsrule) like in [this one](pkg/rules/factory/test_data/jx-apps-explicit/.jx/promote.yaml#L4-L5)
You can [explicitly configure](#rule-configuration) the apps rule by creating a [.jx/promote.yaml](https://github.com/jenkins-x-plugins/jx-promote/blob/master/docs/config.md#promote) configuration file and specifying the [appsRule](https://github.com/jenkins-x-plugins/jx-promote/blob/master/docs/config.md#appsrule) like in [this one](pkg/rules/factory/test_data/jx-apps-explicit/.jx/promote.yaml#L4-L5)

```yaml
apiVersion: promote.jenkins-x.io/v1alpha1
Expand All @@ -68,7 +68,7 @@ The helmfile rule uses a `helmfile.yaml` file from [helmfile](https://github.com

`jx promote` will detect the `helmfile.yaml` file in the root directory automatically without any explicit configuration.

You can [explicitly configure](#rule-configuration) the helmfile rule by creating a [.jx/promote.yaml](https://github.com/jenkins-x/jx-promote/blob/master/docs/config.md#promote) configuration file and specifying the [helmfile rule](https://github.com/jenkins-x/jx-promote/blob/master/docs/config.md#helmfilerule) like [this one](pkg/rules/factory/test_data/helmfile-explicit/.jx/promote.yaml#L4-L5):
You can [explicitly configure](#rule-configuration) the helmfile rule by creating a [.jx/promote.yaml](https://github.com/jenkins-x-plugins/jx-promote/blob/master/docs/config.md#promote) configuration file and specifying the [helmfile rule](https://github.com/jenkins-x-plugins/jx-promote/blob/master/docs/config.md#helmfilerule) like [this one](pkg/rules/factory/test_data/helmfile-explicit/.jx/promote.yaml#L4-L5):

```yaml
apiVersion: promote.jenkins-x.io/v1alpha1
Expand All @@ -82,7 +82,7 @@ spec:

The file rule can modify arbitrary files such as `Makefile` or shell scripts to include a promotion command using tools like [helm](https://helm.sh/) or [kpt](https://googlecontainertools.github.io/kpt/)

To enable the file mode you need to create a [.jx/promote.yaml](https://github.com/jenkins-x/jx-promote/blob/master/docs/config.md#promote) configuration file and specifying the [file rule](https://github.com/jenkins-x/jx-promote/blob/master/docs/config.md#filerule).
To enable the file mode you need to create a [.jx/promote.yaml](https://github.com/jenkins-x-plugins/jx-promote/blob/master/docs/config.md#promote) configuration file and specifying the [file rule](https://github.com/jenkins-x-plugins/jx-promote/blob/master/docs/config.md#filerule).

For example to promote into a `Makefile` using `helm template` you could create a file like [this one](pkg/rules/factory/test_data/make-helm/.jx/promote.yaml#L4-L12):

Expand Down Expand Up @@ -136,7 +136,7 @@ spec:

## Rule Configuration

`jx promote` can automatically detect common configurations as described above or you can explicilty configure the promotion rule in your environment git repository by creating a [.jx/promote.yaml](https://github.com/jenkins-x/jx-promote/blob/master/docs/config.md#promote) configuration file.
`jx promote` can automatically detect common configurations as described above or you can explicilty configure the promotion rule in your environment git repository by creating a [.jx/promote.yaml](https://github.com/jenkins-x-plugins/jx-promote/blob/master/docs/config.md#promote) configuration file.

For example if you wish to configure the [helm rule](#helm) you may want to use a `.jx/promote.yaml` file like [this one](pkg/rules/factory/test_data/helm-explicit/.jx/promote.yaml#L4-L5):

Expand Down
2 changes: 1 addition & 1 deletion cmd/app/main-win.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"syscall"

"github.com/jenkins-x/jx-promote/pkg/cmd"
"github.com/jenkins-x-plugins/jx-promote/pkg/cmd"
)

// Run runs the command, if args are not nil they will be set on the command
Expand Down
2 changes: 1 addition & 1 deletion cmd/app/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package app

import (
"github.com/jenkins-x/jx-promote/pkg/cmd"
"github.com/jenkins-x-plugins/jx-promote/pkg/cmd"
)

// Run runs the command, if args are not nil they will be set on the command
Expand Down
2 changes: 1 addition & 1 deletion cmd/docs/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"path/filepath"
"strings"

"github.com/jenkins-x/jx-promote/pkg/cmd"
"github.com/jenkins-x-plugins/jx-promote/pkg/cmd"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"os"

"github.com/jenkins-x/jx-promote/cmd/app"
"github.com/jenkins-x-plugins/jx-promote/cmd/app"
)

// Entrypoint for the command
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ require (
github.com/cpuguy83/go-md2man v1.0.10
github.com/hashicorp/go-retryablehttp v0.6.6 // indirect
github.com/hashicorp/vault/api v1.0.5-0.20190909201928-35325e2c3262 // indirect
github.com/jenkins-x/go-scm v1.6.7
github.com/jenkins-x-plugins/jx-gitops v0.2.41
github.com/jenkins-x/go-scm v1.6.9
github.com/jenkins-x/jx-api/v4 v4.0.25
github.com/jenkins-x-plugins/jx-gitops v0.2.37
github.com/jenkins-x/jx-helpers/v3 v3.0.93
github.com/jenkins-x/jx-logging/v3 v3.0.3
github.com/mitchellh/mapstructure v1.3.1 // indirect
Expand Down
8 changes: 6 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -773,15 +773,19 @@ github.com/jcmturner/gofork v0.0.0-20190328161633-dc7c13fece03/go.mod h1:MK8+TM0
github.com/jcmturner/gofork v1.0.0/go.mod h1:MK8+TM0La+2rjBD4jE12Kj1pCCxK7d2LK/UM3ncEo0o=
github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 h1:IPJ3dvxmJ4uczJe5YQdrYB16oTJlGSC/OyZDqUk9xX4=
github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869/go.mod h1:cJ6Cj7dQo+O6GJNiMx+Pa94qKj+TG8ONdKHgMNIyyag=
github.com/jenkins-x-plugins/jx-gitops v0.2.37 h1:TdHFAU6avdnIZxig02oNKQQnaTqW9iqQXdvS2Ye/MCc=
github.com/jenkins-x-plugins/jx-gitops v0.2.37/go.mod h1:mlFIDKyPLuL7MotQyhM/zxO6SU7sjHYTmb28ogUInuY=
github.com/jenkins-x-plugins/jx-gitops v0.2.41 h1:Ra7OZSwYCFR67yMkOjwdXcA4S1O8oAEgdiBfU3oFQMQ=
github.com/jenkins-x-plugins/jx-gitops v0.2.41/go.mod h1:EZeyV2x/GvTZtu/7d1pdFHhnzRGaJbfodPwnePZMNXM=
github.com/jenkins-x/go-scm v1.5.117/go.mod h1:PCT338UhP/pQ0IeEeMEf/hoLTYKcH7qjGEKd7jPkeYg=
github.com/jenkins-x/go-scm v1.6.2 h1:IHTL/Wrc559pB9QqMkJpfU/McE4x5rwqxyGwMhbtQwE=
github.com/jenkins-x/go-scm v1.6.2/go.mod h1:yVqpMl3ZSkPWVcPi9EhcK3QtTM/anrtYqI//FqwrdxQ=
github.com/jenkins-x/go-scm v1.6.7 h1:Tc8yLV1B0OdKCbtQX76Bc5FfbsvShqa+HWrTky92vGY=
github.com/jenkins-x/go-scm v1.6.7/go.mod h1:yVqpMl3ZSkPWVcPi9EhcK3QtTM/anrtYqI//FqwrdxQ=
github.com/jenkins-x/go-scm v1.6.9 h1:aurCg0/GGC/EZG0f2IinyYEB2Hjs24Mn3H129r+nMFg=
github.com/jenkins-x/go-scm v1.6.9/go.mod h1:yVqpMl3ZSkPWVcPi9EhcK3QtTM/anrtYqI//FqwrdxQ=
github.com/jenkins-x/jx-api/v4 v4.0.25 h1:G80im88KcIOH8smhzvK/6qOI76RB328dAX9Wneb+xyo=
github.com/jenkins-x/jx-api/v4 v4.0.25/go.mod h1:IC88X+24Nmexuj7lRNRgzfrchzlo0qysfwkICpqDmMQ=
github.com/jenkins-x/jx-gitops v0.2.37 h1:TdHFAU6avdnIZxig02oNKQQnaTqW9iqQXdvS2Ye/MCc=
github.com/jenkins-x/jx-gitops v0.2.37/go.mod h1:mlFIDKyPLuL7MotQyhM/zxO6SU7sjHYTmb28ogUInuY=
github.com/jenkins-x/jx-helpers/v3 v3.0.92 h1:xg3DUt2531IHgeC6yNNnlZOnlmWOXm67YFo/ovz9PNI=
github.com/jenkins-x/jx-helpers/v3 v3.0.92/go.mod h1:W/ZUs7eWMJ+n0qVjUH9TDCc01dBTD9ptnqtS5qehk2c=
github.com/jenkins-x/jx-helpers/v3 v3.0.93 h1:m5FwZOQwxzJS9K7uqJAtkfyZ7WHkpWf0JClNnuM6ITY=
Expand Down
4 changes: 2 additions & 2 deletions hack/changelog-header.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
### Linux

```shell
curl -L https://github.com/jenkins-x/jx-promote/releases/download/v{{.Version}}/jx-promote-linux-amd64.tar.gz | tar xzv
curl -L https://github.com/jenkins-x-plugins/jx-promote/releases/download/v{{.Version}}/jx-promote-linux-amd64.tar.gz | tar xzv
sudo mv jx-promote /usr/local/bin
```

### macOS

```shell
curl -L https://github.com/jenkins-x/jx-promote/releases/download/v{{.Version}}/jx-promote-darwin-amd64.tar.gz | tar xzv
curl -L https://github.com/jenkins-x-plugins/jx-promote/releases/download/v{{.Version}}/jx-promote-darwin-amd64.tar.gz | tar xzv
sudo mv jx-promote /usr/local/bin
```

2 changes: 1 addition & 1 deletion pkg/cmd/root.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cmd

import (
"github.com/jenkins-x/jx-promote/pkg/promote"
"github.com/jenkins-x-plugins/jx-promote/pkg/promote"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/envctx/load.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"os"
"path/filepath"

"github.com/jenkins-x/jx-gitops/pkg/variablefinders"
"github.com/jenkins-x-plugins/jx-gitops/pkg/variablefinders"
"github.com/jenkins-x/jx-helpers/v3/pkg/requirements"

"github.com/jenkins-x/jx-helpers/v3/pkg/files"
Expand Down
4 changes: 2 additions & 2 deletions pkg/environments/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/jenkins-x/jx-helpers/v3/pkg/gitclient"
"github.com/jenkins-x/jx-helpers/v3/pkg/helmer"
"github.com/jenkins-x/jx-helpers/v3/pkg/scmhelpers"
"github.com/jenkins-x/jx-promote/pkg/apis/promote/v1alpha1"
"github.com/jenkins-x/jx-promote/pkg/envctx"
"github.com/jenkins-x-plugins/jx-promote/pkg/apis/promote/v1alpha1"
"github.com/jenkins-x-plugins/jx-promote/pkg/envctx"
"helm.sh/helm/v3/pkg/chart"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/jxtesthelpers/jx_resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
v1 "github.com/jenkins-x/jx-api/v4/pkg/apis/jenkins.io/v1"
"github.com/jenkins-x/jx-helpers/v3/pkg/kube/jxenv"
"github.com/jenkins-x/jx-helpers/v3/pkg/versionstream"
"github.com/jenkins-x/jx-promote/pkg/envctx"
"github.com/jenkins-x-plugins/jx-promote/pkg/envctx"
"github.com/stretchr/testify/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/promote/pr.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"github.com/jenkins-x/go-scm/scm"
"github.com/jenkins-x/jx-helpers/v3/pkg/gitclient"
"github.com/jenkins-x/jx-helpers/v3/pkg/gitclient/gitconfig"
"github.com/jenkins-x/jx-promote/pkg/promoteconfig"
"github.com/jenkins-x/jx-promote/pkg/rules"
"github.com/jenkins-x/jx-promote/pkg/rules/factory"
"github.com/jenkins-x-plugins/jx-promote/pkg/promoteconfig"
"github.com/jenkins-x-plugins/jx-promote/pkg/rules"
"github.com/jenkins-x-plugins/jx-promote/pkg/rules/factory"
"github.com/pkg/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/promote/promote.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (

"github.com/jenkins-x/go-scm/scm"
"github.com/jenkins-x/jx-api/v4/pkg/client/clientset/versioned"
"github.com/jenkins-x/jx-gitops/pkg/cmd/git/setup"
"github.com/jenkins-x-plugins/jx-gitops/pkg/cmd/git/setup"
"github.com/jenkins-x/jx-helpers/v3/pkg/builds"
"github.com/jenkins-x/jx-helpers/v3/pkg/files"
"github.com/jenkins-x/jx-helpers/v3/pkg/gitclient"
Expand All @@ -31,7 +31,7 @@ import (
"github.com/jenkins-x/jx-helpers/v3/pkg/options"
"github.com/jenkins-x/jx-helpers/v3/pkg/stringhelpers"
"github.com/jenkins-x/jx-helpers/v3/pkg/termcolor"
"github.com/jenkins-x/jx-promote/pkg/environments"
"github.com/jenkins-x-plugins/jx-promote/pkg/environments"
"k8s.io/client-go/kubernetes"

"github.com/jenkins-x/jx-helpers/v3/pkg/cobras/helper"
Expand Down
4 changes: 2 additions & 2 deletions pkg/promote/promote_integration_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"github.com/jenkins-x/jx-helpers/v3/pkg/cmdrunner"
"github.com/jenkins-x/jx-helpers/v3/pkg/cmdrunner/fakerunner"
"github.com/jenkins-x/jx-helpers/v3/pkg/stringhelpers"
"github.com/jenkins-x/jx-promote/pkg/jxtesthelpers"
"github.com/jenkins-x/jx-promote/pkg/promote"
"github.com/jenkins-x-plugins/jx-promote/pkg/jxtesthelpers"
"github.com/jenkins-x-plugins/jx-promote/pkg/promote"
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/promote/promote_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
v1 "github.com/jenkins-x/jx-api/v4/pkg/apis/jenkins.io/v1"
"github.com/jenkins-x/jx-helpers/v3/pkg/input/fake"
"github.com/jenkins-x/jx-helpers/v3/pkg/testhelpers"
"github.com/jenkins-x/jx-promote/pkg/promote"
"github.com/jenkins-x-plugins/jx-promote/pkg/promote"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/promoteconfig/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"path/filepath"

"github.com/jenkins-x/jx-helpers/v3/pkg/files"
"github.com/jenkins-x/jx-promote/pkg/apis/promote/v1alpha1"
"github.com/jenkins-x-plugins/jx-promote/pkg/apis/promote/v1alpha1"
"github.com/pkg/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"sigs.k8s.io/yaml"
Expand Down
2 changes: 1 addition & 1 deletion pkg/promoteconfig/helpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"path/filepath"
"testing"

"github.com/jenkins-x/jx-promote/pkg/promoteconfig"
"github.com/jenkins-x-plugins/jx-promote/pkg/promoteconfig"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
10 changes: 5 additions & 5 deletions pkg/rules/factory/factory.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package factory

import (
"github.com/jenkins-x/jx-promote/pkg/rules"
"github.com/jenkins-x/jx-promote/pkg/rules/file"
"github.com/jenkins-x/jx-promote/pkg/rules/helm"
"github.com/jenkins-x/jx-promote/pkg/rules/helmfile"
"github.com/jenkins-x/jx-promote/pkg/rules/kpt"
"github.com/jenkins-x-plugins/jx-promote/pkg/rules"
"github.com/jenkins-x-plugins/jx-promote/pkg/rules/file"
"github.com/jenkins-x-plugins/jx-promote/pkg/rules/helm"
"github.com/jenkins-x-plugins/jx-promote/pkg/rules/helmfile"
"github.com/jenkins-x-plugins/jx-promote/pkg/rules/kpt"
)

// NewFunction creates a function based on the kind of rule
Expand Down
10 changes: 5 additions & 5 deletions pkg/rules/factory/factory_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (

"github.com/jenkins-x/jx-helpers/v3/pkg/files"
"github.com/jenkins-x/jx-helpers/v3/pkg/testhelpers"
"github.com/jenkins-x/jx-promote/pkg/apis/promote/v1alpha1"
"github.com/jenkins-x/jx-promote/pkg/jxtesthelpers"
"github.com/jenkins-x/jx-promote/pkg/promoteconfig"
"github.com/jenkins-x/jx-promote/pkg/rules"
"github.com/jenkins-x/jx-promote/pkg/rules/factory"
"github.com/jenkins-x-plugins/jx-promote/pkg/apis/promote/v1alpha1"
"github.com/jenkins-x-plugins/jx-promote/pkg/jxtesthelpers"
"github.com/jenkins-x-plugins/jx-promote/pkg/promoteconfig"
"github.com/jenkins-x-plugins/jx-promote/pkg/rules"
"github.com/jenkins-x-plugins/jx-promote/pkg/rules/factory"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/rules/file/file_rule.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/jenkins-x/jx-helpers/v3/pkg/files"
"github.com/jenkins-x/jx-helpers/v3/pkg/termcolor"
"github.com/jenkins-x/jx-logging/v3/pkg/log"
"github.com/jenkins-x/jx-promote/pkg/apis/promote/v1alpha1"
"github.com/jenkins-x/jx-promote/pkg/rules"
"github.com/jenkins-x-plugins/jx-promote/pkg/apis/promote/v1alpha1"
"github.com/jenkins-x-plugins/jx-promote/pkg/rules"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/rules/helm/helm_rule.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/jenkins-x/jx-helpers/v3/pkg/files"
"github.com/jenkins-x/jx-helpers/v3/pkg/helmer"
"github.com/jenkins-x/jx-promote/pkg/rules"
"github.com/jenkins-x-plugins/jx-promote/pkg/rules"
"github.com/pkg/errors"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/rules/helmfile/helmfile_rule.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (

"github.com/jenkins-x/jx-helpers/v3/pkg/files"
"github.com/jenkins-x/jx-helpers/v3/pkg/yaml2s"
"github.com/jenkins-x/jx-promote/pkg/apis/promote/v1alpha1"
"github.com/jenkins-x/jx-promote/pkg/envctx"
"github.com/jenkins-x/jx-promote/pkg/rules"
"github.com/jenkins-x-plugins/jx-promote/pkg/apis/promote/v1alpha1"
"github.com/jenkins-x-plugins/jx-promote/pkg/envctx"
"github.com/jenkins-x-plugins/jx-promote/pkg/rules"
"github.com/pkg/errors"
"github.com/roboll/helmfile/pkg/state"
)
Expand Down
Loading

0 comments on commit 774c685

Please sign in to comment.