From 48a68083dc1fb685d6c35d745ca4b43dcc7373b6 Mon Sep 17 00:00:00 2001 From: rushtehrani Date: Mon, 17 Aug 2020 10:09:24 -0700 Subject: [PATCH] chore: move util/sql to pkg/util/sql --- pkg/cron_workflow_types.go | 2 +- {util => pkg/util}/sql/sql.go | 0 util/sql/sqlutil_test.go => pkg/util/sql/sql_test.go | 0 pkg/workflow_execution_types.go | 2 +- pkg/workflow_template_types.go | 2 +- pkg/workflow_template_version_types.go | 2 +- pkg/workspace_template_types.go | 2 +- pkg/workspace_types.go | 2 +- 8 files changed, 6 insertions(+), 6 deletions(-) rename {util => pkg/util}/sql/sql.go (100%) rename util/sql/sqlutil_test.go => pkg/util/sql/sql_test.go (100%) diff --git a/pkg/cron_workflow_types.go b/pkg/cron_workflow_types.go index 0eecb8d..a63e63c 100644 --- a/pkg/cron_workflow_types.go +++ b/pkg/cron_workflow_types.go @@ -3,8 +3,8 @@ package v1 import ( "encoding/json" "github.com/onepanelio/core/pkg/util/mapping" + "github.com/onepanelio/core/pkg/util/sql" "github.com/onepanelio/core/pkg/util/types" - "github.com/onepanelio/core/util/sql" "gopkg.in/yaml.v2" "time" ) diff --git a/util/sql/sql.go b/pkg/util/sql/sql.go similarity index 100% rename from util/sql/sql.go rename to pkg/util/sql/sql.go diff --git a/util/sql/sqlutil_test.go b/pkg/util/sql/sql_test.go similarity index 100% rename from util/sql/sqlutil_test.go rename to pkg/util/sql/sql_test.go diff --git a/pkg/workflow_execution_types.go b/pkg/workflow_execution_types.go index e282f6a..24280ab 100644 --- a/pkg/workflow_execution_types.go +++ b/pkg/workflow_execution_types.go @@ -3,9 +3,9 @@ package v1 import ( "encoding/json" wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1" + "github.com/onepanelio/core/pkg/util/sql" "github.com/onepanelio/core/pkg/util/types" uid2 "github.com/onepanelio/core/pkg/util/uid" - "github.com/onepanelio/core/util/sql" "time" ) diff --git a/pkg/workflow_template_types.go b/pkg/workflow_template_types.go index a4a9251..842c8cb 100644 --- a/pkg/workflow_template_types.go +++ b/pkg/workflow_template_types.go @@ -4,9 +4,9 @@ import ( "encoding/json" wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1" "github.com/onepanelio/core/pkg/util/mapping" + "github.com/onepanelio/core/pkg/util/sql" "github.com/onepanelio/core/pkg/util/types" uid2 "github.com/onepanelio/core/pkg/util/uid" - "github.com/onepanelio/core/util/sql" log "github.com/sirupsen/logrus" "gopkg.in/yaml.v2" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/workflow_template_version_types.go b/pkg/workflow_template_version_types.go index 94566ee..837a67b 100644 --- a/pkg/workflow_template_version_types.go +++ b/pkg/workflow_template_version_types.go @@ -1,8 +1,8 @@ package v1 import ( + "github.com/onepanelio/core/pkg/util/sql" "github.com/onepanelio/core/pkg/util/types" - "github.com/onepanelio/core/util/sql" "time" ) diff --git a/pkg/workspace_template_types.go b/pkg/workspace_template_types.go index dc31228..e146143 100644 --- a/pkg/workspace_template_types.go +++ b/pkg/workspace_template_types.go @@ -3,9 +3,9 @@ package v1 import ( "fmt" wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1" + "github.com/onepanelio/core/pkg/util/sql" "github.com/onepanelio/core/pkg/util/types" uid2 "github.com/onepanelio/core/pkg/util/uid" - "github.com/onepanelio/core/util/sql" "sigs.k8s.io/yaml" "time" ) diff --git a/pkg/workspace_types.go b/pkg/workspace_types.go index ff68941..6ad81d9 100644 --- a/pkg/workspace_types.go +++ b/pkg/workspace_types.go @@ -3,9 +3,9 @@ package v1 import ( "fmt" wfv1 "github.com/argoproj/argo/pkg/apis/workflow/v1alpha1" + "github.com/onepanelio/core/pkg/util/sql" "github.com/onepanelio/core/pkg/util/types" uid2 "github.com/onepanelio/core/pkg/util/uid" - "github.com/onepanelio/core/util/sql" networking "istio.io/api/networking/v1alpha3" corev1 "k8s.io/api/core/v1" "time"