release.sh,internal/pkg/scaffold/scaffold.go: fix paths and imports

Author: joelanford

internal/pkg/scaffold/scaffold.go

@@ -25,8 +25,8 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/operator-framework/operator-sdk/internal/util/fileutil"
 	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold/input"
+	"github.com/operator-framework/operator-sdk/internal/util/fileutil"
 
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/afero"

release.sh

@@ -31,9 +31,9 @@ fi
 
 # Detect whether versions in code were updated.
 VER_FILE="version/version.go"
-TOML_TMPL_FILE="internal/scaffold/gopkgtoml.go"
-ANS_TOML_TMPL_FILE="internal/scaffold/ansible/gopkgtoml.go"
-HELM_TOML_TMPL_FILE="internal/scaffold/helm/gopkgtoml.go"
+TOML_TMPL_FILE="internal/pkg/scaffold/gopkgtoml.go"
+ANS_TOML_TMPL_FILE="internal/pkg/scaffold/ansible/gopkgtoml.go"
+HELM_TOML_TMPL_FILE="internal/pkg/scaffold/helm/gopkgtoml.go"
 CURR_VER_VER_FILE="$(sed -nr 's/Version = "(.+)"/\1/p' "$VER_FILE" | tr -d ' \t\n')"
 CURR_VER_TMPL_FILE="$(sed -nr 's/.*".*v(.+)".*#osdk_version_annotation/v\1/p' "$TOML_TMPL_FILE" | tr -d ' \t\n')"
 if [[ "$VER" != "$CURR_VER_VER_FILE" || "$VER" != "$CURR_VER_TMPL_FILE" ]]; then

test/e2e/memcached_test.go

@@ -29,10 +29,10 @@ import (
 	"time"
 
 	"github.com/ghodss/yaml"
+	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
 	"github.com/operator-framework/operator-sdk/internal/util/fileutil"
 	"github.com/operator-framework/operator-sdk/internal/util/projutil"
 	"github.com/operator-framework/operator-sdk/internal/util/yamlutil"
-	"github.com/operator-framework/operator-sdk/internal/pkg/scaffold"
 	framework "github.com/operator-framework/operator-sdk/pkg/test"
 	"github.com/operator-framework/operator-sdk/pkg/test/e2eutil"