Skip to content

Commit

Permalink
chore(*): further brigadecore updates, mostly npm library references
Browse files Browse the repository at this point in the history
  • Loading branch information
vdice committed Mar 18, 2019
1 parent a638d71 commit 6281ca1
Show file tree
Hide file tree
Showing 17 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ helm delete brigade --purge
- Gateways
- [BitBucket events](https://github.com/lukepatrick/brigade-bitbucket-gateway): Gateway Support for BitBucket repositories
- [GitLab events](https://github.com/lukepatrick/brigade-gitlab-gateway): Gateway Support for GitLab repositories
- [Kubernetes events](https://github.com/azure/brigade-k8s-gateway): Gateway that listens to Kubernetes event stream
- [Kubernetes events](https://github.com/brigadecore/brigade-k8s-gateway): Gateway that listens to Kubernetes event stream
- [Event Grid gateway](https://github.com/radu-matei/brigade-eventgrid-gateway): Gateway for Azure Event Grid events
- [Cron Gateway](https://github.com/technosophos/brigade-cron): Schedule events to run at a particular time
- [Trello and Generic Webhooks](https://github.com/technosophos/brigade-trello): Experimental gateway for Trello and for generic webhooks
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -450,9 +450,9 @@ func TestController_WithProjectSpecificWorkerConfig(t *testing.T) {
},
{
defaultWorkerImage: "deis/brigade-worker:latest",
projectWorkerImageName: "azure/brigade-worker",
projectWorkerImageName: "brigadecore/brigade-worker",
projectWorkerImageTag: "1234567890",
expWorkerImage: "azure/brigade-worker:1234567890",
expWorkerImage: "brigadecore/brigade-worker:1234567890",
},
{
defaultWorkerImage: "deis/brigade-worker",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ func NewWorkerPod(build, project *v1.Secret, config *Config) v1.Pod {
func workerImageConfig(project *v1.Secret, config *Config) (string, string) {
// There isn't a correct way of making a proper distinction between registry,
// registry+name or name, examples:
// * azure/brigade-worker:1234
// * myregisitry.com/azure/brigade-worker:1234
// * brigadecore/brigade-worker:1234
// * myregisitry.com/brigadecore/brigade-worker:1234
// * myregistry/brigade-worker:1234
// In order to tackle this, registry+name will be the name of the image.

Expand Down
2 changes: 1 addition & 1 deletion brigade-worker/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"typescript": "^3.2.2"
},
"dependencies": {
"@azure/brigadier": "^0.4.0",
"@brigadecore/brigadier": "^0.4.0",
"@kubernetes/client-node": "^0.7.2",
"child-process-promise": "^2.2.1",
"pretty-error": "^2.1.1",
Expand Down
4 changes: 2 additions & 2 deletions brigade-worker/src/app.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/**
* Module app is the main application runner.
*/
import * as events from "@azure/brigadier/out/events";
import * as events from "@brigadecore/brigadier/out/events";
import * as process from "process";
import * as k8s from "./k8s";
import * as brigadier from "./brigadier";
import { Logger, ContextLogger } from "@azure/brigadier/out/logger";
import { Logger, ContextLogger } from "@brigadecore/brigadier/out/logger";

interface BuildStorage {
create(
Expand Down
6 changes: 3 additions & 3 deletions brigade-worker/src/brigadier.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@

/** */

import * as jobImpl from "@azure/brigadier/out/job";
import * as groupImpl from "@azure/brigadier/out/group";
import * as eventsImpl from "@azure/brigadier/out/events";
import * as jobImpl from "@brigadecore/brigadier/out/job";
import * as groupImpl from "@brigadecore/brigadier/out/group";
import * as eventsImpl from "@brigadecore/brigadier/out/events";
import { JobRunner } from "./k8s";

// These are filled by the 'fire' event handler.
Expand Down
4 changes: 2 additions & 2 deletions brigade-worker/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ import * as fs from "fs";
import * as process from "process";
import * as ulid from "ulid";

import * as events from "@azure/brigadier/out/events";
import * as events from "@brigadecore/brigadier/out/events";
import { App } from "./app";
import { ContextLogger, LogLevel } from "@azure/brigadier/out/logger";
import { ContextLogger, LogLevel } from "@brigadecore/brigadier/out/logger";

import { options } from "./k8s";

Expand Down
6 changes: 3 additions & 3 deletions brigade-worker/src/k8s.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
/** */

import * as kubernetes from "@kubernetes/client-node";
import * as jobs from "@azure/brigadier/out/job";
import { LogLevel, ContextLogger } from "@azure/brigadier/out/logger";
import { BrigadeEvent, Project } from "@azure/brigadier/out/events";
import * as jobs from "@brigadecore/brigadier/out/job";
import { LogLevel, ContextLogger } from "@brigadecore/brigadier/out/logger";
import { BrigadeEvent, Project } from "@brigadecore/brigadier/out/events";
import * as fs from "fs";
import * as path from "path";
import * as request from "request";
Expand Down
2 changes: 1 addition & 1 deletion brigade-worker/src/require.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const path = require("path");
const pkgOverrides: Pkg[] = [
{ name: "brigade", override: "./brigadier" },
{ name: "brigadier", override: "./brigadier" },
{ name: "@azure/brigadier", override: "./brigadier" }
{ name: "@brigadecore/brigadier", override: "./brigadier" }
];

class Pkg {
Expand Down
2 changes: 1 addition & 1 deletion brigade-worker/test/app.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import "mocha";
import { assert } from "chai";
import * as events from "@azure/brigadier/out/events";
import * as events from "@brigadecore/brigadier/out/events";
import * as app from "../src/app";
import * as mock from "./mock";
import * as brigadier from "../src/brigadier";
Expand Down
2 changes: 1 addition & 1 deletion brigade-worker/test/brigadier.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import "mocha";
import { assert } from "chai";

import * as brigade from "../src/brigadier";
import * as jobImpl from "@azure/brigadier/out/job";
import * as jobImpl from "@brigadecore/brigadier/out/job";

import * as mock from "./mock";

Expand Down
4 changes: 2 additions & 2 deletions brigade-worker/test/k8s.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { assert } from "chai";
import * as mock from "./mock";

import * as k8s from "../src/k8s";
import { BrigadeEvent, Project } from "@azure/brigadier/out/events";
import { Job, Result, brigadeCachePath, brigadeStoragePath } from "@azure/brigadier/out/job";
import { BrigadeEvent, Project } from "@brigadecore/brigadier/out/events";
import { Job, Result, brigadeCachePath, brigadeStoragePath } from "@brigadecore/brigadier/out/job";

import * as kubernetes from "@kubernetes/client-node";

Expand Down
4 changes: 2 additions & 2 deletions brigade-worker/test/mock.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Project, BrigadeEvent } from "@azure/brigadier/out/events";
import { Result, Job } from "@azure/brigadier/out/job";
import { Project, BrigadeEvent } from "@brigadecore/brigadier/out/events";
import { Result, Job } from "@brigadecore/brigadier/out/job";

// This package contains mocks of objects found elsewhere in Brigade.

Expand Down
4 changes: 2 additions & 2 deletions brigade-worker/test/require.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import { assert } from "chai";
import * as req from "../src/require";

describe("overriding require", function () {
describe("when `@azure/brigadier` is imported", function () {
describe("when `@brigadecore/brigadier` is imported", function () {
it("correctly overrides to `./brigadier`", function () {
assert.equal(req.getOverriddenPackage("@azure/brigadier"), "./brigadier");
assert.equal(req.getOverriddenPackage("@brigadecore/brigadier"), "./brigadier");
});
});

Expand Down
4 changes: 2 additions & 2 deletions brigade-worker/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# yarn lockfile v1


"@azure/brigadier@^0.4.0":
"@brigadecore/brigadier@^0.4.0":
version "0.4.0"
resolved "https://registry.yarnpkg.com/@azure/brigadier/-/brigadier-0.4.0.tgz#6fa24b6fc2dd85ae8a81f1b2cf57c7604597cf5d"
resolved "https://registry.yarnpkg.com/@brigadecore/brigadier/-/brigadier-0.4.0.tgz#6fa24b6fc2dd85ae8a81f1b2cf57c7604597cf5d"
integrity sha512-ApMy7Pcu7+XDJS/2oTS1hpjCgYGNAXRdBubSpX0uipsv5sA8Drj7aB7Q/7EZUxpLmETgI4ZxQs/4l7Bm6c4qZQ==
dependencies:
"@kubernetes/client-node" "^0.7.2"
Expand Down
2 changes: 1 addition & 1 deletion docs/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ relativeURLs = "false"

[[menu.main]]
name = "Github"
url = "https://github.com/azure/brigade"
url = "https://github.com/brigadecore/brigade"
weight = 3
2 changes: 1 addition & 1 deletion docs/content/topics/dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ exports.circumference = function (r) {
Then, in our `brigade.js` we can import that file and use it:

```javascript
const { events } = require("@azure/brigadier")
const { events } = require("@brigadecore/brigadier")
const circle = require("./local-deps/circle");

events.on("exec", function (e, p) {
Expand Down

0 comments on commit 6281ca1

Please sign in to comment.