Skip to content

Commit 802a3e9

Browse files
authored
Merge pull request #4 from /issues/3/main
Project Number取得 #3
2 parents 6563f63 + edffbd2 commit 802a3e9

File tree

6 files changed

+672
-8
lines changed

6 files changed

+672
-8
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!-- This is a template. Please rewrite to the necessary contents when creating the PR. -->
22
<!-- If there is an issue, enter it. -->
3-
Closes #XXX
3+
- Closes #XXX
44

55
<!-- ## Overview -->
66
<!-- Please write the purpose of this PR and the outline of implementation. -->

.github/workflows/go.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
GO111MODULE: on
1414

1515
steps:
16-
- name: Set up Go 1.12
17-
uses: actions/setup-go@v1
16+
- name: Set up Go ^1.13
17+
uses: actions/setup-go@v2
1818
with:
19-
go-version: 1.12
19+
go-version: '^1.13'
2020
id: go
2121

2222
- uses: actions/checkout@v2

constant.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ const (
44
EnvKeyProjectID = "GCP_PROJECT" // for Google Cloud Functions
55
EnvKeyGoogleCloudProject = "GOOGLE_CLOUD_PROJECT" // for Google App Engine
66

7+
// EnvKeyServiceName will be deleted in a major version upgrade
78
// Deprecated
89
EnvKeyServiceName = "GAE_SERVICE" // for Google App Engine
10+
// EnvKeyServiceVersion will be deleted in a major version upgrade
911
// Deprecated
1012
EnvKeyServiceVersion = "GAE_VERSION" // for Google App Engine
1113

environ.go

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
package gcpen
22

33
import (
4+
"context"
45
"os"
6+
7+
"google.golang.org/api/cloudresourcemanager/v1"
58
)
69

710
var (
811
// ProjectID - Google Cloud Platform Project ID
9-
ProjectID = getProjectID()
12+
ProjectID = getProjectID()
13+
projectNumber int64
1014

1115
// ServiceName - Google App Engine service name
1216
// Deprecated
@@ -40,19 +44,40 @@ func getProjectID() string {
4044
return ""
4145
}
4246

43-
// Reload - Reload environment variables.
47+
// Reload - reload environment variables.
4448
func Reload() {
4549
ProjectID = getProjectID()
4650

51+
// ServiceName - will be deleted in a major version upgrade
4752
// Deprecated
48-
// ServiceName - Deprecated
4953
ServiceName = os.Getenv(EnvKeyServiceName)
54+
// ServiceVersion - will be deleted in a major version upgrade
5055
// Deprecated
51-
// ServiceVersion - Deprecated
5256
ServiceVersion = os.Getenv(EnvKeyServiceVersion)
5357

5458
GAEServiceName = os.Getenv(EnvKeyGAEServiceName)
5559
GAEServiceVersion = os.Getenv(EnvKeyGAEServiceVersion)
5660
RUNServiceName = os.Getenv(EnvKeyRUNServiceName)
5761
RUNServiceRevision = os.Getenv(EnvKeyRUNServiceRevision)
5862
}
63+
64+
// GetProjectNumber - get project number
65+
func GetProjectNumber(ctx context.Context, forceRefresh ...bool) (int64, error) {
66+
if projectNumber != 0 && !(len(forceRefresh) > 0 && forceRefresh[0]) {
67+
return projectNumber, nil
68+
}
69+
70+
service, err := cloudresourcemanager.NewService(ctx)
71+
if err != nil {
72+
return 0, err
73+
}
74+
75+
project, err := service.Projects.Get(getProjectID()).Context(ctx).Do()
76+
if err != nil {
77+
return 0, err
78+
}
79+
80+
projectNumber = project.ProjectNumber
81+
82+
return projectNumber, nil
83+
}

go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
module github.com/gcp-kit/gcpen
22

33
go 1.13
4+
5+
require google.golang.org/api v0.84.0

0 commit comments

Comments
 (0)