detectors/gcp: remove CloudRunJobs constant

Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>
GoogleCloudPlatform · Jul 29, 2022 · 5cf62cc · 5cf62cc
1 parent 69870af
commit 5cf62cc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/detectors/gcp/detector.go b/detectors/gcp/detector.go
@@ -36,7 +36,6 @@ const (
 	GKE
 	GCE
 	CloudRun
-	CloudRunJobs
 	CloudFunctions
 	AppEngineStandard
 	AppEngineFlex
@@ -49,8 +48,6 @@ func (d *Detector) CloudPlatform() Platform {
 		return GKE
 	case d.onCloudRun():
 		return CloudRun
-	case d.onCloudRunJobs():
-		return CloudRunJobs
 	case d.onCloudFunctions():
 		return CloudFunctions
 	case d.onAppEngineStandard():

diff --git a/detectors/gcp/detector_test.go b/detectors/gcp/detector_test.go
@@ -77,7 +77,7 @@ func TestCloudPlatformCloudRunJobs(t *testing.T) {
 		},
 	})
 	platform := d.CloudPlatform()
-	assert.Equal(t, platform, CloudRunJobs)
+	assert.Equal(t, platform, CloudRun)
 }
 
 func TestCloudPlatformCloudFunctions(t *testing.T) {

diff --git a/detectors/gcp/faas.go b/detectors/gcp/faas.go
@@ -33,11 +33,10 @@ const (
 )
 
 func (d *Detector) onCloudRun() bool {
-	_, found := d.os.LookupEnv(cloudRunConfigEnv)
-	return found
-}
+	if _, found := d.os.LookupEnv(cloudRunConfigEnv); found {
+		return found
+	}
 
-func (d *Detector) onCloudRunJobs() bool {
 	_, found := d.os.LookupEnv(cloudRunJobsEnv)
 	return found
 }