v2/services/mgmt,v/services/mgmt: install package override (server)
Server-side changes corresponding to go/vcl/3982. In addition, we rename
application PackageSpec to SignedFile, and change the application Envelope to
use SignedFile instead of Binary + Signature fields.
Change-Id: Icd19faaad48aba7665c1805dbac7d5b1ee3dcc24
diff --git a/tools/application/impl.go b/tools/application/impl.go
index 21720c6..ba4daf6 100644
--- a/tools/application/impl.go
+++ b/tools/application/impl.go
@@ -109,7 +109,7 @@
fmt.Fprintln(cmd.Stdout(), "Application envelope added successfully.")
return nil
}
- env := application.Envelope{Args: []string{}, Env: []string{}, Packages: map[string]application.PackageSpec{}}
+ env := application.Envelope{Args: []string{}, Env: []string{}, Packages: application.Packages{}}
j, err := json.MarshalIndent(env, "", " ")
if err != nil {
return fmt.Errorf("MarshalIndent() failed: %v", err)
diff --git a/tools/application/impl_test.go b/tools/application/impl_test.go
index d84dc63..fae33d4 100644
--- a/tools/application/impl_test.go
+++ b/tools/application/impl_test.go
@@ -25,10 +25,10 @@
envelope = application.Envelope{
Title: "fifa world cup",
Args: []string{"arg1", "arg2", "arg3"},
- Binary: "/path/to/binary",
+ Binary: application.SignedFile{File: "/path/to/binary"},
Env: []string{"env1", "env2", "env3"},
- Packages: map[string]application.PackageSpec{
- "pkg1": application.PackageSpec{
+ Packages: map[string]application.SignedFile{
+ "pkg1": application.SignedFile{
File: "/path/to/package1",
},
},
@@ -40,12 +40,14 @@
"arg2",
"arg3"
],
- "Binary": "/path/to/binary",
- "Signature": {
- "Purpose": "",
- "Hash": "",
- "R": "",
- "S": ""
+ "Binary": {
+ "File": "/path/to/binary",
+ "Signature": {
+ "Purpose": "",
+ "Hash": "",
+ "R": "",
+ "S": ""
+ }
},
"Publisher": {
"CertificateChains": null
diff --git a/tools/mgmt/device/impl/devicemanager_mock_test.go b/tools/mgmt/device/impl/devicemanager_mock_test.go
index 8dcebf6..5b652d1 100644
--- a/tools/mgmt/device/impl/devicemanager_mock_test.go
+++ b/tools/mgmt/device/impl/devicemanager_mock_test.go
@@ -158,8 +158,8 @@
if err != nil {
return "", err
}
- binaryName := envelope.Binary
- envelope.Binary = binaryNameAfterFetch
+ binaryName := envelope.Binary.File
+ envelope.Binary.File = binaryNameAfterFetch
is.appName = appNameAfterFetch
is.files = make(map[string]int64)
// Fetch the binary and record its size in the stimulus.
diff --git a/tools/mgmt/device/impl/impl_test.go b/tools/mgmt/device/impl/impl_test.go
index acfb7d9..48ae4ab 100644
--- a/tools/mgmt/device/impl/impl_test.go
+++ b/tools/mgmt/device/impl/impl_test.go
@@ -183,7 +183,7 @@
deviceName := naming.JoinAddressName(endpoint.String(), "")
appId := "myBestAppID"
cfg := device.Config{"someflag": "somevalue"}
- pkg := application.Packages{"pkg": application.PackageSpec{
+ pkg := application.Packages{"pkg": application.SignedFile{
File: "somename",
// If we leave this unset, the server will get a Signature that
// looks like the one we're setting below (in particular, the
diff --git a/tools/mgmt/device/impl/local_install.go b/tools/mgmt/device/impl/local_install.go
index 21200c7..85cc430 100644
--- a/tools/mgmt/device/impl/local_install.go
+++ b/tools/mgmt/device/impl/local_install.go
@@ -271,7 +271,7 @@
return fmt.Errorf("failed to create server: %v", err)
}
defer cancel()
- envelope.Binary, err = server.serve("binary", repository.BinaryServer(binaryInvoker(binary)))
+ envelope.Binary.File, err = server.serve("binary", repository.BinaryServer(binaryInvoker(binary)))
if err != nil {
return err
}
@@ -286,13 +286,13 @@
defer os.RemoveAll(tmpZipDir)
for _, p := range pkgs {
if envelope.Packages == nil {
- envelope.Packages = make(map[string]application.PackageSpec)
+ envelope.Packages = make(application.Packages)
}
pname, oname, err := servePackage(p, server, tmpZipDir)
if err != nil {
return err
}
- envelope.Packages[pname] = application.PackageSpec{File: oname}
+ envelope.Packages[pname] = application.SignedFile{File: oname}
}
packagesRewritten := application.Packages{}
for pname, pspec := range packagesOverride {
diff --git a/tools/mgmt/device/impl/local_install_test.go b/tools/mgmt/device/impl/local_install_test.go
index a28bce1..09f06fd 100644
--- a/tools/mgmt/device/impl/local_install_test.go
+++ b/tools/mgmt/device/impl/local_install_test.go
@@ -115,9 +115,9 @@
createFile(t, filepath.Join(pkgDir2, "f1"), "123456")
createFile(t, filepath.Join(pkgDir2, "f2"), "78")
pkg := application.Packages{
- "overridepkg1": application.PackageSpec{File: pkgFile3},
- "overridepkg2": application.PackageSpec{File: pkgFile4},
- "overridepkg3": application.PackageSpec{File: pkgDir2},
+ "overridepkg1": application.SignedFile{File: pkgFile3},
+ "overridepkg2": application.SignedFile{File: pkgFile4},
+ "overridepkg3": application.SignedFile{File: pkgDir2},
}
for i, c := range []struct {
@@ -136,9 +136,11 @@
nil,
nil,
application.Envelope{
- Title: appTitle,
- Binary: binaryNameAfterFetch,
- Signature: emptySig,
+ Title: appTitle,
+ Binary: application.SignedFile{
+ File: binaryNameAfterFetch,
+ Signature: emptySig,
+ },
Publisher: emptyBlessings,
},
map[string]int64{"binary": binarySize}},
@@ -153,9 +155,11 @@
cfg,
nil,
application.Envelope{
- Title: appTitle,
- Binary: binaryNameAfterFetch,
- Signature: emptySig,
+ Title: appTitle,
+ Binary: application.SignedFile{
+ File: binaryNameAfterFetch,
+ Signature: emptySig,
+ },
Publisher: emptyBlessings,
},
map[string]int64{"binary": binarySize}},
@@ -170,9 +174,11 @@
nil,
nil,
application.Envelope{
- Title: appTitle,
- Binary: binaryNameAfterFetch,
- Signature: emptySig,
+ Title: appTitle,
+ Binary: application.SignedFile{
+ File: binaryNameAfterFetch,
+ Signature: emptySig,
+ },
Publisher: emptyBlessings,
Env: []string{"ENV1=V1", "ENV2=V2"},
Args: []string{"FLAG1=V1", "FLAG2=V2"},
@@ -188,9 +194,11 @@
nil,
nil,
application.Envelope{
- Title: appTitle,
- Binary: binaryNameAfterFetch,
- Signature: emptySig,
+ Title: appTitle,
+ Binary: application.SignedFile{
+ File: binaryNameAfterFetch,
+ Signature: emptySig,
+ },
Publisher: emptyBlessings,
Env: []string{"ENV=V"},
Args: []string{"FLAG=V"},
diff --git a/tools/mgmt/test.sh b/tools/mgmt/test.sh
index f924cf6..8269f2f 100755
--- a/tools/mgmt/test.sh
+++ b/tools/mgmt/test.sh
@@ -204,8 +204,9 @@
local -r SAMPLE_APP_NAME="${APPLICATIOND_NAME}/testapp/v0"
local -r APP_PUBLISH_NAME="testbinaryd"
echo ">> Uploading ${SAMPLE_APP_NAME}"
- echo "{\"Title\":\"BINARYD\", \"Args\":[\"--name=${APP_PUBLISH_NAME}\", \"--root_dir=./binstore\", \"--veyron.tcp.address=127.0.0.1:0\"], \"Binary\":\"${SAMPLE_APP_BIN_NAME}\", \"Env\":[]}" > ./app.envelope && \
- "${APPLICATION_BIN}" put "${SAMPLE_APP_NAME}" "${DEVICE_PROFILE}" ./app.envelope && rm ./app.envelope
+ echo "{\"Title\":\"BINARYD\", \"Args\":[\"--name=${APP_PUBLISH_NAME}\", \"--root_dir=./binstore\", \"--veyron.tcp.address=127.0.0.1:0\"], \"Binary\":{\"File\":\"${SAMPLE_APP_BIN_NAME}\"}, \"Env\":[]}" > ./app.envelope
+ "${APPLICATION_BIN}" put "${SAMPLE_APP_NAME}" "${DEVICE_PROFILE}" ./app.envelope
+ rm ./app.envelope
# Verify that the envelope we uploaded shows up with glob.
shell_test::assert_eq "$("${APPLICATION_BIN}" match "${SAMPLE_APP_NAME}" "${DEVICE_PROFILE}" | grep Title | sed -e 's/^.*"Title": "'// | sed -e 's/",//')" \
@@ -248,9 +249,9 @@
# Upload a device manager envelope.
echo ">> Uploading ${DEVICED_APP_NAME}"
- echo "{\"Title\":\"device manager\", \"Binary\":\"${DEVICED_APP_BIN_NAME}\"}" > ./deviced.envelope && \
- "${APPLICATION_BIN}" put "${DEVICED_APP_NAME}" "${DEVICE_PROFILE}" ./deviced.envelope && rm ./deviced.envelope
-
+ echo "{\"Title\":\"device manager\", \"Binary\":{\"File\":\"${DEVICED_APP_BIN_NAME}\"}}" > ./deviced.envelope
+ "${APPLICATION_BIN}" put "${DEVICED_APP_NAME}" "${DEVICE_PROFILE}" ./deviced.envelope
+ rm ./deviced.envelope
# Update the device manager.
echo ">> Updating device manager"
"${DEVICE_BIN}" update "${MT_NAME}/devmgr/device"
