Skip to content
This repository has been archived by the owner on Jul 13, 2023. It is now read-only.

feat!: monitoring convert to typescript #360

Merged
merged 19 commits into from
Feb 18, 2020
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
**/*.log
**/node_modules
.coverage
coverage
.nyc_output
docs/
out/
Expand All @@ -9,7 +10,5 @@ system-test/secrets.js
system-test/*key.json
*.lock
.DS_Store
google-cloud-logging-winston-*.tgz
google-cloud-logging-bunyan-*.tgz
package-lock.json
__pycache__
2 changes: 1 addition & 1 deletion .jsdoc.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module.exports = {
source: {
excludePattern: '(^|\\/|\\\\)[._]',
include: [
'src'
'build/src'
],
includePattern: '\\.js$'
},
Expand Down
1 change: 0 additions & 1 deletion linkinator.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"skip": [
"https://codecov.io/gh/googleapis/",
"www.googleapis.com",
"https://cloud.google.com/monitoring/workspaces/tiers",
"img.shields.io"
]
}
47 changes: 33 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"node": ">=8.10.0"
},
"repository": "googleapis/nodejs-monitoring",
"main": "src/index.js",
"main": "build/src/index.js",
"files": [
"src",
"protos"
"build/src",
"build/protos"
],
"keywords": [
"google apis client",
Expand All @@ -28,30 +28,49 @@
],
"scripts": {
"docs": "jsdoc -c .jsdoc.js",
"lint": "eslint '**/*.js'",
"samples-test": "cd samples/ && npm link ../ && npm test && cd ../",
"system-test": "mocha system-test/*.js --timeout 600000",
JustinBeckwith marked this conversation as resolved.
Show resolved Hide resolved
"test": "c8 mocha",
"fix": "eslint '**/*.js' --fix",
"lint": "gts fix && eslint --fix samples/*.js",
"samples-test": "cd samples/ && npm link ../ && npm install && npm test && cd ../",
"system-test": "mocha build/system-test",
"test": "c8 mocha build/test",
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that don't look right :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Weird, it doesn't show on my local. The latest commit doesn't contain these "HEAD".

"fix": "gts fix && eslint 'samples/**/*.js' --fix",
summer-ji-eng marked this conversation as resolved.
Show resolved Hide resolved
"docs-test": "linkinator docs",
"predocs-test": "npm run docs",
"prelint": "cd samples; npm link ../; npm i"
summer-ji-eng marked this conversation as resolved.
Show resolved Hide resolved
"prelint": "cd samples; npm link ../; npm i",
=======
"fix": "gts fix",
"docs-test": "linkinator docs",
"predocs-test": "npm run docs",
>>>>>>> 8047a580f020c8f97aa72503de9f66a9633e9f3e
"clean": "gts clean",
"compile": "tsc -p . && cp -r protos build/",
"compile-protos": "compileProtos src",
"prepare": "npm run compile"
},
"dependencies": {
"google-gax": "^1.7.5"
"google-gax": "^1.14.1"
},
"devDependencies": {
"c8": "^7.0.0",
"codecov": "^3.0.0",
"@types/mocha": "^5.2.5",
"@types/node": "^12.12.27",
"c8": "^7.1.0",
"codecov": "^3.6.5",
"eslint": "^6.0.0",
"eslint-config-prettier": "^6.0.0",
"eslint-plugin-node": "^11.0.0",
"eslint-plugin-prettier": "^3.0.0",
"gts": "^1.0.0",
"jsdoc": "^3.5.5",
"jsdoc-fresh": "^1.0.1",
"jsdoc-region-tag": "^1.0.2",
"linkinator": "^2.0.0",
"mocha": "^7.0.0",
"prettier": "^1.7.4"
"mocha": "^7.0.1",
"null-loader": "^3.0.0",
"pack-n-play": "^1.0.0-2",
"prettier": "^1.13.7",
"ts-loader": "^6.2.1",
"typescript": "^3.7.0",
JustinBeckwith marked this conversation as resolved.
Show resolved Hide resolved
"webpack": "^4.41.6",
"webpack-cli": "^3.3.11"
}
}
52 changes: 52 additions & 0 deletions protos/google/cloud/common_resources.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
// Copyright 2019 Google LLC.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

// This file contains stub messages for common resources in GCP.
// It is not intended to be directly generated, and is instead used by
// other tooling to be able to match common resource patterns.
syntax = "proto3";

package google.cloud;

import "google/api/resource.proto";


option (google.api.resource_definition) = {
type: "cloudresourcemanager.googleapis.com/Project"
pattern: "projects/{project}"
};


option (google.api.resource_definition) = {
type: "cloudresourcemanager.googleapis.com/Organization"
pattern: "organizations/{organization}"
};


option (google.api.resource_definition) = {
type: "cloudresourcemanager.googleapis.com/Folder"
pattern: "folders/{folder}"
};


option (google.api.resource_definition) = {
type: "cloudbilling.googleapis.com/BillingAccount"
pattern: "billingAccounts/{billing_account}"
};

option (google.api.resource_definition) = {
type: "locations.googleapis.com/Location"
pattern: "projects/{project}/locations/{location}"
};

Loading