kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-04 17:35:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

modify fingerprint interface to use typed attribute struct

Browse Source
This commit is contained in:
Preetha Appan
2018-11-20 18:30:39 -06:00
parent 4922256170
commit 829bf74aa8
26 changed files with 357 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/java/driver.go
View File

@@ -24,6 +24,7 @@ import (
"github.com/hashicorp/nomad/plugins/shared"
"github.com/hashicorp/nomad/plugins/shared/hclspec"
"github.com/hashicorp/nomad/plugins/shared/loader"
pstructs "github.com/hashicorp/nomad/plugins/shared/structs"
)
const (
@@ -195,7 +196,7 @@ func (d *Driver) handleFingerprint(ctx context.Context, ch chan *drivers.Fingerp
func (d *Driver) buildFingerprint() *drivers.Fingerprint {
fp := &drivers.Fingerprint{
Attributes: map[string]string{},
Attributes: map[string]*pstructs.Attribute{},
Health: drivers.HealthStateHealthy,
HealthDescription: "healthy",
}
@@ -232,10 +233,10 @@ func (d *Driver) buildFingerprint() *drivers.Fingerprint {
return fp
}
fp.Attributes[driverAttr] = "1"
fp.Attributes[driverVersionAttr] = version
fp.Attributes["driver.java.runtime"] = runtime
fp.Attributes["driver.java.vm"] = vm
fp.Attributes[driverAttr] = pstructs.NewBoolAttribute(true)
fp.Attributes[driverVersionAttr] = pstructs.NewStringAttribute(version)
fp.Attributes["driver.java.runtime"] = pstructs.NewStringAttribute(runtime)
fp.Attributes["driver.java.vm"] = pstructs.NewStringAttribute(vm)
return fp
}

3
drivers/java/driver_test.go
View File

@@ -47,7 +47,8 @@ func TestJavaDriver_Fingerprint(t *testing.T) {
select {
case fp := <-fpCh:
require.Equal(t, drivers.HealthStateHealthy, fp.Health)
require.Equal(t, "1", fp.Attributes["driver.java"])
detected, _ := fp.Attributes["driver.java"].GetBool()
require.True(t, detected)
case <-time.After(time.Duration(testutil.TestMultiplier()*5) * time.Second):
require.Fail(t, "timeout receiving fingerprint")
}