org rename

Author: nkubala

.travis.yml

@@ -7,7 +7,7 @@ sudo: required
 services:
   - docker
 
-go_import_path: github.com/GoogleCloudPlatform/container-diff
+go_import_path: github.com/GoogleContainerTools/container-diff
 
 addons:
   apt:

BUILD

@@ -4,15 +4,15 @@ load("@bazel_gazelle//:def.bzl", "gazelle")
 gazelle(
     name = "gazelle",
     external = "vendored",
-    prefix = "github.com/GoogleCloudPlatform/container-diff",
+    prefix = "github.com/GoogleContainerTools/container-diff",
 )
 
-go_prefix("github.com/GoogleCloudPlatform/container-diff")
+go_prefix("github.com/GoogleContainerTools/container-diff")
 
 go_library(
     name = "go_default_library",
     srcs = ["main.go"],
-    importpath = "github.com/GoogleCloudPlatform/container-diff",
+    importpath = "github.com/GoogleContainerTools/container-diff",
     visibility = ["//visibility:private"],
     deps = [
         "//cmd:go_default_library",
@@ -23,6 +23,6 @@ go_library(
 go_binary(
     name = "container-diff",
     embed = [":go_default_library"],
-    importpath = "github.com/GoogleCloudPlatform/container-diff",
+    importpath = "github.com/GoogleContainerTools/container-diff",
     visibility = ["//visibility:public"],
 )

CONTRIBUTING.md

@@ -13,9 +13,9 @@ with your personal GitHub account. Then, clone the fork into your `$GOPATH`:
 
 ```bash
 git clone [email protected]:<your_account>/container-diff.git 
-$GOPATH/src/github.com/GoogleCloudPlatform &&
-cd $GOPATH/src/github.com/GoogleCloudPlatform/container-diff &&
-git remote add upstream [email protected]:GoogleCloudPlatform/container-diff.git
+$GOPATH/src/github.com/GoogleContainerTools &&
+cd $GOPATH/src/github.com/GoogleContainerTools/container-diff &&
+git remote add upstream [email protected]:GoogleContainerTools/container-diff.git
 ```
 
 The last command here sets the official repository as an upstream repository for

Dockerfile.build

@@ -1,6 +1,6 @@
 # Dockerfile used to build a build step that builds container-diff in CI.
 FROM golang:1.9
 RUN apt-get update && apt-get install make
-RUN mkdir -p /go/src/github.com/GoogleCloudPlatform/
-RUN ln -s /workspace /go/src/github.com/GoogleCloudPlatform/container-diff
-WORKDIR /go/src/github.com/GoogleCloudPlatform/container-diff
+RUN mkdir -p /go/src/github.com/GoogleContainerTools/
+RUN ln -s /workspace /go/src/github.com/GoogleContainerTools/container-diff
+WORKDIR /go/src/github.com/GoogleContainerTools/container-diff

Makefile

@@ -22,7 +22,7 @@ VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
 GOOS ?= $(shell go env GOOS)
 GOARCH = amd64
 BUILD_DIR ?= ./out
-ORG := github.com/GoogleCloudPlatform
+ORG := github.com/GoogleContainerTools
 PROJECT := container-diff
 REPOPATH ?= $(ORG)/$(PROJECT)
 RELEASE_BUCKET ?= $(PROJECT)

README.md

@@ -1,7 +1,7 @@
 # container-diff
 
 [![Build
-Status](https://travis-ci.org/GoogleCloudPlatform/container-diff.svg?branch=master)](https://travis-ci.org/GoogleCloudPlatform/container-diff)
+Status](https://travis-ci.org/GoogleContainerTools/container-diff.svg?branch=master)](https://travis-ci.org/GoogleContainerTools/container-diff)
 
 ## What is container-diff?
 
@@ -245,7 +245,7 @@ type MultiVersionInfo struct {
 ```
 
 ## User Customized Output
-Users can customize the format of the output of diffs with the`--format` flag. The flag takes a Go template string, which specifies the format the diff should be output in. This template string uses the structs described above, depending on the differ used, to format output.  The default template strings container-diff uses can be found [here](https://github.com/GoogleCloudPlatform/container-diff/blob/master/util/template_utils.go).
+Users can customize the format of the output of diffs with the`--format` flag. The flag takes a Go template string, which specifies the format the diff should be output in. This template string uses the structs described above, depending on the differ used, to format output.  The default template strings container-diff uses can be found [here](https://github.com/GoogleContainerTools/container-diff/blob/master/util/template_utils.go).
 
 An example using the pip package analyzer is shown below, in which only package names are printed (some are repeated because of version differences).
 
@@ -442,9 +442,9 @@ In order to quickly make your own analyzer, follow these steps:
 1. Determine if you can use existing analyzing or diffing tools.  If you can make use of existing tools, you then need to construct the structs to feed into the tools by getting all of the packages for each image or the analogous quality to be analyzed.  To determine if you can leverage existing tools, think through these questions:
 - Are you trying to analyze packages?
     - Yes: Does the relevant package manager support different versions of the same package on one image?
-        - Yes: Implement `getPackages` to collect all versions of all packages within an image in a `map[string]map[string]util.PackageInfo`. Use [`GetMultiVersionMapDiff`](https://github.com/GoogleCloudPlatform/container-diff/blob/0031c88993c9ac019e2d404815ef50c652d8d010/util/package_diff_utils.go#L119-L126) to diff map objects.  See [`differs/node_diff.go`](https://github.com/GoogleCloudPlatform/container-diff/blob/0031c88993c9ac019e2d404815ef50c652d8d010/differs/node_diff.go#L49-L93) or [`differs/pip_diff.go`](https://github.com/GoogleCloudPlatform/container-diff/blob/0031c88993c9ac019e2d404815ef50c652d8d010/differs/pip_diff.go#L48-L111) for examples.
-        -  No: Implement `getPackages` to collect all versions of all packages within an image in a `map[string]util.PackageInfo`. Use [`GetMapDiff`](https://github.com/GoogleCloudPlatform/container-diff/blob/31cec2304b54ae6ae444ccde4382b113d8e06097/util/package_diff_utils.go#L110-L117) to diff map objects.  See [`differs/apt_diff.go`](https://github.com/GoogleCloudPlatform/container-diff/blob/master/differs/apt_diff.go#L29).
-    - No: Look to [History](https://github.com/GoogleCloudPlatform/container-diff/blob/0031c88993c9ac019e2d404815ef50c652d8d010/differs/history_diff.go) and [File System](https://github.com/GoogleCloudPlatform/container-diff/blob/0031c88993c9ac019e2d404815ef50c652d8d010/differs/file_diff.go) differs as models for diffing.
+        - Yes: Implement `getPackages` to collect all versions of all packages within an image in a `map[string]map[string]util.PackageInfo`. Use [`GetMultiVersionMapDiff`](https://github.com/GoogleContainerTools/container-diff/blob/0031c88993c9ac019e2d404815ef50c652d8d010/util/package_diff_utils.go#L119-L126) to diff map objects.  See [`differs/node_diff.go`](https://github.com/GoogleContainerTools/container-diff/blob/0031c88993c9ac019e2d404815ef50c652d8d010/differs/node_diff.go#L49-L93) or [`differs/pip_diff.go`](https://github.com/GoogleContainerTools/container-diff/blob/0031c88993c9ac019e2d404815ef50c652d8d010/differs/pip_diff.go#L48-L111) for examples.
+        -  No: Implement `getPackages` to collect all versions of all packages within an image in a `map[string]util.PackageInfo`. Use [`GetMapDiff`](https://github.com/GoogleContainerTools/container-diff/blob/31cec2304b54ae6ae444ccde4382b113d8e06097/util/package_diff_utils.go#L110-L117) to diff map objects.  See [`differs/apt_diff.go`](https://github.com/GoogleContainerTools/container-diff/blob/master/differs/apt_diff.go#L29).
+    - No: Look to [History](https://github.com/GoogleContainerTools/container-diff/blob/0031c88993c9ac019e2d404815ef50c652d8d010/differs/history_diff.go) and [File System](https://github.com/GoogleContainerTools/container-diff/blob/0031c88993c9ac019e2d404815ef50c652d8d010/differs/file_diff.go) differs as models for diffing.
 
 2. Write your analyzer driver in the `differs` directory, such that you have a struct for your analyzer type and two methods for that analyzer: `Analyze` for single image analysis and `Diff` for comparison between two images:
 
@@ -458,7 +458,7 @@ The image arguments passed to your analyzer contain the path to the unpacked tar
 
 If using existing package tools, you should create the appropriate structs (e.g. `SingleVersionPackageAnalyzeResult` or `SingleVersionPackageDiffResult`) to analyze or diff.  Otherwise, create your own structs which should yield information to fill an AnalyzeResult or DiffResult as the return type for Analyze() and Diff(), respectively, and should implement the `Result` interface, as in the next step.
 
-3. Create a struct following the [`Result`](https://github.com/GoogleCloudPlatform/container-diff/blob/0031c88993c9ac019e2d404815ef50c652d8d010/util/analyze_output_utils.go#L27-L30) interface by implementing the following two methods.
+3. Create a struct following the [`Result`](https://github.com/GoogleContainerTools/container-diff/blob/0031c88993c9ac019e2d404815ef50c652d8d010/util/analyze_output_utils.go#L27-L30) interface by implementing the following two methods.
 
 ```go
 type Result interface {
@@ -467,6 +467,6 @@ type Result interface {
 }
 ```
 
-This is where you define how your analyzer should output for a human readable format (`OutputText`) and as a struct which can then be written to a `.json` file.  See [`util/diff_output_utils.go`](https://github.com/GoogleCloudPlatform/container-diff/blob/0031c88993c9ac019e2d404815ef50c652d8d010/util/diff_output_utils.go) and [`util/analyze_output_utils.go`](https://github.com/GoogleCloudPlatform/container-diff/blob/0031c88993c9ac019e2d404815ef50c652d8d010/util/analyze_output_utils.go).
+This is where you define how your analyzer should output for a human readable format (`OutputText`) and as a struct which can then be written to a `.json` file.  See [`util/diff_output_utils.go`](https://github.com/GoogleContainerTools/container-diff/blob/0031c88993c9ac019e2d404815ef50c652d8d010/util/diff_output_utils.go) and [`util/analyze_output_utils.go`](https://github.com/GoogleContainerTools/container-diff/blob/0031c88993c9ac019e2d404815ef50c652d8d010/util/analyze_output_utils.go).
 
-4. Add your analyzer to the `Analyzers` map in [`differs/differs.go`](https://github.com/GoogleCloudPlatform/container-diff/blob/0031c88993c9ac019e2d404815ef50c652d8d010/differs/differs.go#L44-L50) with the corresponding Analyzer struct as the value.
+4. Add your analyzer to the `Analyzers` map in [`differs/differs.go`](https://github.com/GoogleContainerTools/container-diff/blob/0031c88993c9ac019e2d404815ef50c652d8d010/differs/differs.go#L44-L50) with the corresponding Analyzer struct as the value.

RELEASING.md

@@ -1,6 +1,6 @@
 # Releasing container-diff
 
-The github.com/GoogleCloudPlatform/container-diff uses Container Builder triggers to build and release binaries.
+The github.com/GoogleContainerTools/container-diff uses Container Builder triggers to build and release binaries.
 These triggers are setup via the Cloud Console, but the builds they execute live in this repo.
 
 ## Continuous Builds

cmd/BUILD.bazel

@@ -8,7 +8,7 @@ go_library(
         "root.go",
         "version.go",
     ],
-    importpath = "github.com/GoogleCloudPlatform/container-diff/cmd",
+    importpath = "github.com/GoogleContainerTools/container-diff/cmd",
     visibility = ["//visibility:public"],
     deps = [
         "//cmd/util/output:go_default_library",
@@ -34,5 +34,5 @@ go_test(
         "root_test.go",
     ],
     embed = [":go_default_library"],
-    importpath = "github.com/GoogleCloudPlatform/container-diff/cmd",
+    importpath = "github.com/GoogleContainerTools/container-diff/cmd",
 )

cmd/analyze.go

@@ -21,9 +21,9 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/GoogleCloudPlatform/container-diff/cmd/util/output"
-	"github.com/GoogleCloudPlatform/container-diff/differs"
-	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
+	"github.com/GoogleContainerTools/container-diff/cmd/util/output"
+	"github.com/GoogleContainerTools/container-diff/differs"
+	pkgutil "github.com/GoogleContainerTools/container-diff/pkg/util"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

cmd/diff.go

@@ -22,10 +22,10 @@ import (
 	"os"
 	"sync"
 
-	"github.com/GoogleCloudPlatform/container-diff/cmd/util/output"
-	"github.com/GoogleCloudPlatform/container-diff/differs"
-	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
-	"github.com/GoogleCloudPlatform/container-diff/util"
+	"github.com/GoogleContainerTools/container-diff/cmd/util/output"
+	"github.com/GoogleContainerTools/container-diff/differs"
+	pkgutil "github.com/GoogleContainerTools/container-diff/pkg/util"
+	"github.com/GoogleContainerTools/container-diff/util"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

cmd/root.go

@@ -24,10 +24,10 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/GoogleCloudPlatform/container-diff/differs"
-	"github.com/GoogleCloudPlatform/container-diff/pkg/cache"
-	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
-	"github.com/GoogleCloudPlatform/container-diff/util"
+	"github.com/GoogleContainerTools/container-diff/differs"
+	"github.com/GoogleContainerTools/container-diff/pkg/cache"
+	pkgutil "github.com/GoogleContainerTools/container-diff/pkg/util"
+	"github.com/GoogleContainerTools/container-diff/util"
 	"github.com/containers/image/docker"
 	"github.com/docker/docker/client"
 	homedir "github.com/mitchellh/go-homedir"

cmd/util/output/BUILD.bazel

@@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["output.go"],
-    importpath = "github.com/GoogleCloudPlatform/container-diff/cmd/util/output",
+    importpath = "github.com/GoogleContainerTools/container-diff/cmd/util/output",
     visibility = ["//visibility:public"],
     deps = ["//vendor/github.com/spf13/cobra:go_default_library"],
 )

cmd/version.go

@@ -19,7 +19,7 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/GoogleCloudPlatform/container-diff/version"
+	"github.com/GoogleContainerTools/container-diff/version"
 	"github.com/spf13/cobra"
 )
 

differs/BUILD.bazel

@@ -13,7 +13,7 @@ go_library(
         "pip_diff.go",
         "rpm_diff.go",
     ],
-    importpath = "github.com/GoogleCloudPlatform/container-diff/differs",
+    importpath = "github.com/GoogleContainerTools/container-diff/differs",
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/util:go_default_library",
@@ -35,7 +35,7 @@ go_test(
         "rpm_diff_test.go",
     ],
     embed = [":go_default_library"],
-    importpath = "github.com/GoogleCloudPlatform/container-diff/differs",
+    importpath = "github.com/GoogleContainerTools/container-diff/differs",
     deps = [
         "//pkg/util:go_default_library",
         "//util:go_default_library",

differs/apt_diff.go

@@ -23,8 +23,8 @@ import (
 	"strconv"
 	"strings"
 
-	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
-	"github.com/GoogleCloudPlatform/container-diff/util"
+	pkgutil "github.com/GoogleContainerTools/container-diff/pkg/util"
+	"github.com/GoogleContainerTools/container-diff/util"
 	"github.com/sirupsen/logrus"
 )
 

differs/apt_diff_test.go

@@ -20,8 +20,8 @@ import (
 	"reflect"
 	"testing"
 
-	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
-	"github.com/GoogleCloudPlatform/container-diff/util"
+	pkgutil "github.com/GoogleContainerTools/container-diff/pkg/util"
+	"github.com/GoogleContainerTools/container-diff/util"
 )
 
 func TestParseLine(t *testing.T) {

differs/differs.go

@@ -19,8 +19,8 @@ package differs
 import (
 	"fmt"
 
-	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
-	"github.com/GoogleCloudPlatform/container-diff/util"
+	pkgutil "github.com/GoogleContainerTools/container-diff/pkg/util"
+	"github.com/GoogleContainerTools/container-diff/util"
 	"github.com/sirupsen/logrus"
 )
 

differs/file_diff.go

@@ -17,8 +17,8 @@ limitations under the License.
 package differs
 
 import (
-	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
-	"github.com/GoogleCloudPlatform/container-diff/util"
+	pkgutil "github.com/GoogleContainerTools/container-diff/pkg/util"
+	"github.com/GoogleContainerTools/container-diff/util"
 )
 
 type FileAnalyzer struct {

differs/history_diff.go

@@ -19,8 +19,8 @@ package differs
 import (
 	"strings"
 
-	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
-	"github.com/GoogleCloudPlatform/container-diff/util"
+	pkgutil "github.com/GoogleContainerTools/container-diff/pkg/util"
+	"github.com/GoogleContainerTools/container-diff/util"
 )
 
 type HistoryAnalyzer struct {

differs/metadata_diff.go

@@ -17,8 +17,8 @@ limitations under the License.
 package differs
 
 import (
-	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
-	"github.com/GoogleCloudPlatform/container-diff/util"
+	pkgutil "github.com/GoogleContainerTools/container-diff/pkg/util"
+	"github.com/GoogleContainerTools/container-diff/util"
 )
 
 type MetadataAnalyzer struct {

differs/node_diff.go

@@ -23,8 +23,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
-	"github.com/GoogleCloudPlatform/container-diff/util"
+	pkgutil "github.com/GoogleContainerTools/container-diff/pkg/util"
+	"github.com/GoogleContainerTools/container-diff/util"
 	"github.com/sirupsen/logrus"
 )
 

differs/node_diff_test.go

@@ -20,8 +20,8 @@ import (
 	"reflect"
 	"testing"
 
-	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
-	"github.com/GoogleCloudPlatform/container-diff/util"
+	pkgutil "github.com/GoogleContainerTools/container-diff/pkg/util"
+	"github.com/GoogleContainerTools/container-diff/util"
 )
 
 func TestGetNodePackages(t *testing.T) {

differs/package_differs.go

@@ -19,8 +19,8 @@ package differs
 import (
 	"strings"
 
-	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
-	"github.com/GoogleCloudPlatform/container-diff/util"
+	pkgutil "github.com/GoogleContainerTools/container-diff/pkg/util"
+	"github.com/GoogleContainerTools/container-diff/util"
 )
 
 type MultiVersionPackageAnalyzer interface {

differs/pip_diff.go

@@ -22,8 +22,8 @@ import (
 	"regexp"
 	"strings"
 
-	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
-	"github.com/GoogleCloudPlatform/container-diff/util"
+	pkgutil "github.com/GoogleContainerTools/container-diff/pkg/util"
+	"github.com/GoogleContainerTools/container-diff/util"
 	"github.com/sirupsen/logrus"
 )
 

differs/pip_diff_test.go

@@ -20,8 +20,8 @@ import (
 	"reflect"
 	"testing"
 
-	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
-	"github.com/GoogleCloudPlatform/container-diff/util"
+	pkgutil "github.com/GoogleContainerTools/container-diff/pkg/util"
+	"github.com/GoogleContainerTools/container-diff/util"
 )
 
 func TestGetPythonVersion(t *testing.T) {

differs/rpm_diff.go

@@ -32,8 +32,8 @@ import (
 	"sync"
 	"time"
 
-	pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
-	"github.com/GoogleCloudPlatform/container-diff/util"
+	pkgutil "github.com/GoogleContainerTools/container-diff/pkg/util"
+	"github.com/GoogleContainerTools/container-diff/util"
 	dockertar "github.com/containers/image/docker/tarfile"
 	godocker "github.com/fsouza/go-dockerclient"
 	"github.com/nightlyone/lockfile"

main.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/GoogleCloudPlatform/container-diff/cmd"
+	"github.com/GoogleContainerTools/container-diff/cmd"
 	"github.com/pkg/profile"
 )
 

pkg/cache/BUILD.bazel

@@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library")
 go_library(
     name = "go_default_library",
     srcs = ["file_cache.go"],
-    importpath = "github.com/GoogleCloudPlatform/container-diff/pkg/cache",
+    importpath = "github.com/GoogleContainerTools/container-diff/pkg/cache",
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/image:go_default_library",

pkg/cache/file_cache.go

@@ -22,7 +22,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/GoogleCloudPlatform/container-diff/pkg/image"
+	"github.com/GoogleContainerTools/container-diff/pkg/image"
 	"github.com/containers/image/types"
 	"github.com/sirupsen/logrus"
 )

pkg/image/BUILD.bazel

@@ -6,7 +6,7 @@ go_library(
         "mutable_source.go",
         "proxy_types.go",
     ],
-    importpath = "github.com/GoogleCloudPlatform/container-diff/pkg/image",
+    importpath = "github.com/GoogleContainerTools/container-diff/pkg/image",
     visibility = ["//visibility:public"],
     deps = [
         "//vendor/github.com/containers/image/image:go_default_library",
@@ -21,7 +21,7 @@ go_test(
     name = "go_default_test",
     srcs = ["mutable_source_test.go"],
     embed = [":go_default_library"],
-    importpath = "github.com/GoogleCloudPlatform/container-diff/pkg/image",
+    importpath = "github.com/GoogleContainerTools/container-diff/pkg/image",
     deps = [
         "//vendor/github.com/containers/image/manifest:go_default_library",
         "//vendor/github.com/containers/image/types:go_default_library",