Skip to content
This repository was archived by the owner on Mar 27, 2024. It is now read-only.

Commit b2e2f7e

Browse files
authored
Merge pull request #225 from nkubala/rename
Org rename
2 parents d5c78eb + b823a7a commit b2e2f7e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+82
-82
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ sudo: required
77
services:
88
- docker
99

10-
go_import_path: github.com/GoogleCloudPlatform/container-diff
10+
go_import_path: github.com/GoogleContainerTools/container-diff
1111

1212
addons:
1313
apt:

BUILD

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ load("@bazel_gazelle//:def.bzl", "gazelle")
44
gazelle(
55
name = "gazelle",
66
external = "vendored",
7-
prefix = "github.com/GoogleCloudPlatform/container-diff",
7+
prefix = "github.com/GoogleContainerTools/container-diff",
88
)
99

10-
go_prefix("github.com/GoogleCloudPlatform/container-diff")
10+
go_prefix("github.com/GoogleContainerTools/container-diff")
1111

1212
go_library(
1313
name = "go_default_library",
1414
srcs = ["main.go"],
15-
importpath = "github.com/GoogleCloudPlatform/container-diff",
15+
importpath = "github.com/GoogleContainerTools/container-diff",
1616
visibility = ["//visibility:private"],
1717
deps = [
1818
"//cmd:go_default_library",
@@ -23,6 +23,6 @@ go_library(
2323
go_binary(
2424
name = "container-diff",
2525
embed = [":go_default_library"],
26-
importpath = "github.com/GoogleCloudPlatform/container-diff",
26+
importpath = "github.com/GoogleContainerTools/container-diff",
2727
visibility = ["//visibility:public"],
2828
)

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ with your personal GitHub account. Then, clone the fork into your `$GOPATH`:
1313

1414
```bash
1515
git clone [email protected]:<your_account>/container-diff.git
16-
$GOPATH/src/github.com/GoogleCloudPlatform &&
17-
cd $GOPATH/src/github.com/GoogleCloudPlatform/container-diff &&
18-
git remote add upstream [email protected]:GoogleCloudPlatform/container-diff.git
16+
$GOPATH/src/github.com/GoogleContainerTools &&
17+
cd $GOPATH/src/github.com/GoogleContainerTools/container-diff &&
18+
git remote add upstream [email protected]:GoogleContainerTools/container-diff.git
1919
```
2020

2121
The last command here sets the official repository as an upstream repository for

Dockerfile.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Dockerfile used to build a build step that builds container-diff in CI.
22
FROM golang:1.9
33
RUN apt-get update && apt-get install make
4-
RUN mkdir -p /go/src/github.com/GoogleCloudPlatform/
5-
RUN ln -s /workspace /go/src/github.com/GoogleCloudPlatform/container-diff
6-
WORKDIR /go/src/github.com/GoogleCloudPlatform/container-diff
4+
RUN mkdir -p /go/src/github.com/GoogleContainerTools/
5+
RUN ln -s /workspace /go/src/github.com/GoogleContainerTools/container-diff
6+
WORKDIR /go/src/github.com/GoogleContainerTools/container-diff

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
2222
GOOS ?= $(shell go env GOOS)
2323
GOARCH = amd64
2424
BUILD_DIR ?= ./out
25-
ORG := github.com/GoogleCloudPlatform
25+
ORG := github.com/GoogleContainerTools
2626
PROJECT := container-diff
2727
REPOPATH ?= $(ORG)/$(PROJECT)
2828
RELEASE_BUCKET ?= $(PROJECT)

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# container-diff
22

33
[![Build
4-
Status](https://travis-ci.org/GoogleCloudPlatform/container-diff.svg?branch=master)](https://travis-ci.org/GoogleCloudPlatform/container-diff)
4+
Status](https://travis-ci.org/GoogleContainerTools/container-diff.svg?branch=master)](https://travis-ci.org/GoogleContainerTools/container-diff)
55

66
## What is container-diff?
77

@@ -245,7 +245,7 @@ type MultiVersionInfo struct {
245245
```
246246

247247
## User Customized Output
248-
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).
248+
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).
249249

250250
An example using the pip package analyzer is shown below, in which only package names are printed (some are repeated because of version differences).
251251

@@ -442,9 +442,9 @@ In order to quickly make your own analyzer, follow these steps:
442442
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:
443443
- Are you trying to analyze packages?
444444
- Yes: Does the relevant package manager support different versions of the same package on one image?
445-
- 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.
446-
- 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).
447-
- 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.
445+
- 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.
446+
- 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).
447+
- 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.
448448

449449
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:
450450

@@ -458,7 +458,7 @@ The image arguments passed to your analyzer contain the path to the unpacked tar
458458

459459
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.
460460

461-
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.
461+
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.
462462

463463
```go
464464
type Result interface {
@@ -467,6 +467,6 @@ type Result interface {
467467
}
468468
```
469469

470-
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).
470+
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).
471471

472-
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.
472+
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Releasing container-diff
22

3-
The github.com/GoogleCloudPlatform/container-diff uses Container Builder triggers to build and release binaries.
3+
The github.com/GoogleContainerTools/container-diff uses Container Builder triggers to build and release binaries.
44
These triggers are setup via the Cloud Console, but the builds they execute live in this repo.
55

66
## Continuous Builds

cmd/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ go_library(
88
"root.go",
99
"version.go",
1010
],
11-
importpath = "github.com/GoogleCloudPlatform/container-diff/cmd",
11+
importpath = "github.com/GoogleContainerTools/container-diff/cmd",
1212
visibility = ["//visibility:public"],
1313
deps = [
1414
"//cmd/util/output:go_default_library",
@@ -34,5 +34,5 @@ go_test(
3434
"root_test.go",
3535
],
3636
embed = [":go_default_library"],
37-
importpath = "github.com/GoogleCloudPlatform/container-diff/cmd",
37+
importpath = "github.com/GoogleContainerTools/container-diff/cmd",
3838
)

cmd/analyze.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import (
2121
"fmt"
2222
"os"
2323

24-
"github.com/GoogleCloudPlatform/container-diff/cmd/util/output"
25-
"github.com/GoogleCloudPlatform/container-diff/differs"
26-
pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
24+
"github.com/GoogleContainerTools/container-diff/cmd/util/output"
25+
"github.com/GoogleContainerTools/container-diff/differs"
26+
pkgutil "github.com/GoogleContainerTools/container-diff/pkg/util"
2727
"github.com/sirupsen/logrus"
2828
"github.com/spf13/cobra"
2929
)

cmd/diff.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ import (
2222
"os"
2323
"sync"
2424

25-
"github.com/GoogleCloudPlatform/container-diff/cmd/util/output"
26-
"github.com/GoogleCloudPlatform/container-diff/differs"
27-
pkgutil "github.com/GoogleCloudPlatform/container-diff/pkg/util"
28-
"github.com/GoogleCloudPlatform/container-diff/util"
25+
"github.com/GoogleContainerTools/container-diff/cmd/util/output"
26+
"github.com/GoogleContainerTools/container-diff/differs"
27+
pkgutil "github.com/GoogleContainerTools/container-diff/pkg/util"
28+
"github.com/GoogleContainerTools/container-diff/util"
2929
"github.com/sirupsen/logrus"
3030
"github.com/spf13/cobra"
3131
)

0 commit comments

Comments
 (0)