Skip to content

feat: use metadata package #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JulienBreux wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: use metadata package #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@ module github.com/googlecloudplatform/cloud-run-hello

go 1.14

require github.com/cloudevents/sdk-go/v2 v2.15.2
require (
cloud.google.com/go/compute/metadata v0.5.0 // indirect
github.com/cloudevents/sdk-go/v2 v2.15.2
)
4 changes: 4 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
cloud.google.com/go/compute/metadata v0.5.0 h1:Zr0eK8JbFv6+Wi4ilXAR8FJ3wyNdpxHKJNPos6LTZOY=
cloud.google.com/go/compute/metadata v0.5.0/go.mod h1:aHnloV2TPI38yx4s9+wAZhHykWvVCfu7hQbF+9CWoiY=
github.com/cloudevents/sdk-go/v2 v2.15.2 h1:54+I5xQEnI73RBhWHxbI1XJcqOFOVJN85vb41+8mHUc=
github.com/cloudevents/sdk-go/v2 v2.15.2/go.mod h1:lL7kSWAE/V8VI4Wh0jbL2v/jvqsm6tjmaQBSvxcv4uE=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
Expand Down Expand Up @@ -40,6 +42,8 @@ go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/
go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM=
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs=
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
Expand Down
58 changes: 8 additions & 50 deletions hello.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,11 @@ import (
"encoding/json"
"fmt"
"html/template"
"io/ioutil"
"log"
"net/http"
"os"
"regexp"

"cloud.google.com/go/compute/metadata"
cloudevents "github.com/cloudevents/sdk-go/v2"
cloudeventsClient "github.com/cloudevents/sdk-go/v2/client"
)
Expand All @@ -34,7 +33,7 @@ type Data struct {
Service string
Revision string
Project string
Region string
Zone string
AuthenticatedEmail string
Color string
}
Expand Down Expand Up @@ -97,56 +96,15 @@ func getEventsHandler() *cloudeventsClient.EventReceiver {
}

func main() {
ctx := context.Background()

tmpl := template.Must(template.ParseFiles("index.html"))

// Get project ID from metadata server
project := ""
client := &http.Client{}
req, _ := http.NewRequest("GET", "http://metadata.google.internal/computeMetadata/v1/project/project-id", nil)
req.Header.Set("Metadata-Flavor", "Google")
res, err := client.Do(req)
if err == nil {
defer res.Body.Close()
if res.StatusCode == 200 {
responseBody, err := ioutil.ReadAll(res.Body)
if err != nil {
log.Fatal(err)
}
project = string(responseBody)
}
}
project, _ := metadata.ProjectIDWithContext(ctx)

// Get region from metadata server
region := ""
req, _ = http.NewRequest("GET", "http://metadata.google.internal/computeMetadata/v1/instance/region", nil)
req.Header.Set("Metadata-Flavor", "Google")
res, err = client.Do(req)
if err == nil {
defer res.Body.Close()
if res.StatusCode == 200 {
responseBody, err := ioutil.ReadAll(res.Body)
if err != nil {
log.Fatal(err)
}
region = regexp.MustCompile(`projects/[^/]*/regions/`).ReplaceAllString(string(responseBody), "")
}
}
if region == "" {
// Fallback: get "zone" from metadata server (running on VM e.g. Cloud Run for Anthos)
req, _ = http.NewRequest("GET", "http://metadata.google.internal/computeMetadata/v1/instance/zone", nil)
req.Header.Set("Metadata-Flavor", "Google")
res, err = client.Do(req)
if err == nil {
defer res.Body.Close()
if res.StatusCode == 200 {
responseBody, err := ioutil.ReadAll(res.Body)
if err != nil {
log.Fatal(err)
}
region = regexp.MustCompile(`projects/[^/]*/zones/`).ReplaceAllString(string(responseBody), "")
}
}
}
// Get zone from metadata server
zone, _ := metadata.ZoneWithContext(ctx)

service := os.Getenv("K_SERVICE")
revision := os.Getenv("K_REVISION")
Expand All @@ -157,7 +115,7 @@ func main() {
Service: service,
Revision: revision,
Project: project,
Region: region,
Zone: zone,
Copy link
Copy Markdown
Contributor

@grayside grayside Jul 12, 2024

Choose a reason for hiding this comment

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

blocker: Cloud Run uses region not zone. While we can extract the region from the zone, we can't use it directly. We should teach using region and how to extract region from zone.

Copy link
Copy Markdown
Member Author

@JulienBreux JulienBreux Jul 26, 2024

Choose a reason for hiding this comment

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

Ok, thanks for this relevant comment!
I think region is missing from metadata package.
I need to check (sorry for delay) here: https://github.com/googleapis/google-cloud-go/blob/main/compute/metadata/metadata.go

Color: color,
}

Expand Down