Skip to content

Move packages from pkg to internal #921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 7, 2023
Merged

Move packages from pkg to internal #921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
358a2a1
Move packages from `pkg` to `internal`
int128 May 7, 2023
aeb042c
Generated by GitHub Actions (go / generate)
github-actions[bot] May 7, 2023
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
8 changes: 2 additions & 6 deletions .github/workflows/docker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ on:
- .github/workflows/docker.yaml
- Dockerfile
- go.*
- main.go
- api/**
- controllers/**
- pkg/**
- internal/**
- e2e_test/**
- '!**/*_test.go'
- '!**/*.md'
Expand All @@ -22,10 +20,8 @@ on:
- .github/workflows/docker.yaml
- Dockerfile
- go.*
- main.go
- api/**
- controllers/**
- pkg/**
- internal/**
- e2e_test/**
- '!**/*_test.go'
- '!**/*.md'
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ RUN go mod download
# Copy the go source
COPY cmd/main.go cmd/main.go
COPY api/ api/
COPY internal/controller/ internal/controller/
COPY pkg/ pkg/
COPY internal/ internal/

# Build
# the GOARCH has not a default value to allow the binary be built according to the host where the command
Expand Down
4 changes: 2 additions & 2 deletions cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ import (

argocdcommenterv1 "github.com/int128/argocd-commenter/api/v1"
"github.com/int128/argocd-commenter/internal/controller"
"github.com/int128/argocd-commenter/pkg/github"
"github.com/int128/argocd-commenter/pkg/notification"
"github.com/int128/argocd-commenter/internal/github"
"github.com/int128/argocd-commenter/internal/notification"
//+kubebuilder:scaffold:imports
)

Expand Down
0 pkg/argocd/application.go → internal/argocd/application.go
View file
Open in desktop
File renamed without changes.
0 pkg/argocd/configmap.go → internal/argocd/configmap.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions internal/controller/applicationdeletiondeployment_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (

argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/argoproj/gitops-engine/pkg/health"
"github.com/int128/argocd-commenter/internal/argocd"
"github.com/int128/argocd-commenter/internal/controller/predicates"
"github.com/int128/argocd-commenter/pkg/argocd"
"github.com/int128/argocd-commenter/pkg/notification"
"github.com/int128/argocd-commenter/internal/notification"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/applicationhealthcomment_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/argoproj/gitops-engine/pkg/health"
argocdcommenterv1 "github.com/int128/argocd-commenter/api/v1"
"github.com/int128/argocd-commenter/internal/argocd"
"github.com/int128/argocd-commenter/internal/controller/predicates"
"github.com/int128/argocd-commenter/pkg/argocd"
"github.com/int128/argocd-commenter/pkg/notification"
"github.com/int128/argocd-commenter/internal/notification"
corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/applicationhealthdeployment_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (

argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/argoproj/gitops-engine/pkg/health"
"github.com/int128/argocd-commenter/internal/argocd"
"github.com/int128/argocd-commenter/internal/controller/predicates"
"github.com/int128/argocd-commenter/pkg/argocd"
"github.com/int128/argocd-commenter/pkg/notification"
"github.com/int128/argocd-commenter/internal/notification"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/applicationphasecomment_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (

argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
synccommon "github.com/argoproj/gitops-engine/pkg/sync/common"
"github.com/int128/argocd-commenter/internal/argocd"
"github.com/int128/argocd-commenter/internal/controller/predicates"
"github.com/int128/argocd-commenter/pkg/argocd"
"github.com/int128/argocd-commenter/pkg/notification"
"github.com/int128/argocd-commenter/internal/notification"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/applicationphasedeployment_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (

argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
synccommon "github.com/argoproj/gitops-engine/pkg/sync/common"
"github.com/int128/argocd-commenter/internal/argocd"
"github.com/int128/argocd-commenter/internal/controller/predicates"
"github.com/int128/argocd-commenter/pkg/argocd"
"github.com/int128/argocd-commenter/pkg/notification"
"github.com/int128/argocd-commenter/internal/notification"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/tools/record"
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
"time"

argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/int128/argocd-commenter/pkg/github"
"github.com/int128/argocd-commenter/pkg/notification"
"github.com/int128/argocd-commenter/internal/github"
"github.com/int128/argocd-commenter/internal/notification"
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"go.uber.org/zap/zapcore"
Expand Down
0 pkg/github/client.go → internal/github/client.go
View file
Open in desktop
File renamed without changes.
0 pkg/github/comment.go → internal/github/comment.go
View file
Open in desktop
File renamed without changes.
0 pkg/github/deployment.go → internal/github/deployment.go
View file
Open in desktop
File renamed without changes.
0 pkg/github/deployment_test.go → internal/github/deployment_test.go
View file
Open in desktop
File renamed without changes.
0 pkg/github/pull.go → internal/github/pull.go
View file
Open in desktop
File renamed without changes.
0 pkg/github/types.go → internal/github/types.go
View file
Open in desktop
File renamed without changes.
0 pkg/github/types_test.go → internal/github/types_test.go
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/notification/comment.go → internal/notification/comment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/argoproj/gitops-engine/pkg/health"
synccommon "github.com/argoproj/gitops-engine/pkg/sync/common"
"github.com/go-logr/logr"
"github.com/int128/argocd-commenter/pkg/argocd"
"github.com/int128/argocd-commenter/pkg/github"
"github.com/int128/argocd-commenter/internal/argocd"
"github.com/int128/argocd-commenter/internal/github"
"k8s.io/apimachinery/pkg/util/errors"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/notification/deployment.go → internal/notification/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/argoproj/gitops-engine/pkg/health"
synccommon "github.com/argoproj/gitops-engine/pkg/sync/common"
"github.com/go-logr/logr"
"github.com/int128/argocd-commenter/pkg/argocd"
"github.com/int128/argocd-commenter/pkg/github"
"github.com/int128/argocd-commenter/internal/argocd"
"github.com/int128/argocd-commenter/internal/github"
)

type DeploymentStatus struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/notification/pull.go → internal/notification/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"strings"

argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/int128/argocd-commenter/pkg/github"
"github.com/int128/argocd-commenter/internal/github"
)

func filterPullRequestsRelatedToEvent(pulls []github.PullRequest, app argocdv1alpha1.Application) []int {
Expand Down
0 pkg/notification/pull_test.go → internal/notification/pull_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/notification/types.go → internal/notification/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"

argocdv1alpha1 "github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1"
"github.com/int128/argocd-commenter/pkg/github"
"github.com/int128/argocd-commenter/internal/github"
)

type Client interface {
Expand Down