commit 8838dfe2467c5bd5bdfdcee85d0ae6e605c32638
author Scott Baker <smbaker@gmail.com> Tue Mar 12 14:28:57 2019 -0700
committer Scott Baker <smbaker@gmail.com> Tue Mar 12 16:13:18 2019 -0700
tree cf7591de996f2759de404184b845424aa71510b8
parent 06f77ad7fb86c52b0cae7bd13ce75dc3bfe7e1fa

SEBA-420 remove superfluous xproto options

Change-Id: Ib40f61f1e51b21b616dd8cf98c417f78cbbf24b9

Dockerfile.synchronizer

diff --git a/Dockerfile.synchronizer b/Dockerfile.synchronizer
index 44276b1..d854f24 100644
--- a/Dockerfile.synchronizer
+++ b/Dockerfile.synchronizer
@@ -16,7 +16,7 @@
 
 # xosproject/simpleexampleservice-synchronizer
 
-FROM xosproject/xos-synchronizer-base:2.2.5
+FROM xosproject/xos-synchronizer-base:2.2.18
 
 COPY xos/synchronizer /opt/xos/synchronizers/simpleexampleservice
 COPY VERSION /opt/xos/synchronizers/simpleexampleservice/

xos/synchronizer/models/simpleexampleservice.xproto

diff --git a/xos/synchronizer/models/simpleexampleservice.xproto b/xos/synchronizer/models/simpleexampleservice.xproto
index 6f08c85..5cf4e70 100644
--- a/xos/synchronizer/models/simpleexampleservice.xproto
+++ b/xos/synchronizer/models/simpleexampleservice.xproto
@@ -7,11 +7,9 @@
 
     required string service_message = 1 [
         help_text = "Service Message to display in web page",
-        db_index = False,
         max_length = 254];
     optional string service_secret = 2 [
-        help_text = "Service Secret to place in a file",
-        db_index = False];
+        help_text = "Service Secret to place in a file"];
 }
 
 // Note: Named ColorNew to prevent name collision with ExampleService's Color.
@@ -22,11 +20,9 @@
 
      required string name = 1 [
          help_text = "Name for this color",
-         db_index = False,
          max_length = 256];
      required string html_code = 2 [
          help_text = "HTML Code for this color",
-         db_index = False,
          max_length = 256];
 }
 
@@ -38,9 +34,7 @@
 
     optional manytoone compute_instance->ComputeServiceInstance:service_instance_with_computes = 1:1001 [
         help_text = "ComputeServiceInstance that holds compute resources for this ServiceInstance",
-        blank=True,
-        db_index=True,
-        null=True];
+        db_index=True];
 }
 
 message SimpleExampleServiceInstance (ServiceInstanceWithCompute2){
@@ -49,7 +43,6 @@
 
      required string tenant_message = 1 [
          help_text = "Tenant Message to Display",
-         db_index = False,
          max_length = 254];
      optional manytoone foreground_color->ColorNew:serviceinstance_foreground_colors = 2:1001 [
          help_text = "Foreground color to use in web page",
@@ -58,8 +51,7 @@
          help_text = "Background color to use in web page",
          db_index = True];
      optional string tenant_secret = 4 [
-         help_text = "Tenant Secret to place in a file",
-         db_index = False];
+         help_text = "Tenant Secret to place in a file"];
 }
 
 // Note: Named EmbeddedImageNew to prevent name collision with ExampleService's EmbeddedImage.
@@ -70,11 +62,9 @@
 
      required string name = 1 [
          help_text = "Name for this image",
-         db_index = False,
          max_length = 256];
      required string url = 2 [
          help_text = "URL for this image",
-         db_index = False,
          max_length = 256];
      optional manytoone serviceinstance->SimpleExampleServiceInstance:embedded_images = 3:1001 [
          help_text = "ServiceInstance that represents the web page where this embedded image should be placed",