Merge branch 'suzuki-shunsuke-debug-issue-237'

Author: mavogel

docker/resource_docker_service_funcs.go

@@ -98,45 +98,76 @@ func resourceDockerServiceCreate(d *schema.ResourceData, meta interface{}) error
 }
 
 func resourceDockerServiceRead(d *schema.ResourceData, meta interface{}) error {
-	client := meta.(*ProviderConfig).DockerClient
+	log.Printf("[INFO] Waiting for service: '%s' to expose all fields: max '%v seconds'", d.Id(), 30)
 
-	apiService, err := fetchDockerService(d.Id(), d.Get("name").(string), client)
-	if err != nil {
-		return err
+	stateConf := &resource.StateChangeConf{
+		Pending:    []string{"pending"},
+		Target:     []string{"all_fields", "removed"},
+		Refresh:    resourceDockerServiceReadRefreshFunc(d, meta),
+		Timeout:    30 * time.Second,
+		MinTimeout: 5 * time.Second,
+		Delay:      2 * time.Second,
 	}
-	if apiService == nil {
-		d.SetId("")
-		return nil
-	}
-	service, _, err := client.ServiceInspectWithRaw(context.Background(), apiService.ID, types.ServiceInspectOptions{})
+
+	// Wait, catching any errors
+	_, err := stateConf.WaitForState()
 	if err != nil {
-		return fmt.Errorf("Error inspecting service %s: %s", apiService.ID, err)
+		return err
 	}
 
-	jsonObj, _ := json.MarshalIndent(service, "", "\t")
-	log.Printf("[DEBUG] Docker service inspect: %s", jsonObj)
+	return nil
+}
 
-	d.SetId(service.ID)
-	d.Set("name", service.Spec.Name)
-	d.Set("labels", mapToLabelSet(service.Spec.Labels))
+func resourceDockerServiceReadRefreshFunc(
+	d *schema.ResourceData, meta interface{}) resource.StateRefreshFunc {
+	return func() (interface{}, string, error) {
+		client := meta.(*ProviderConfig).DockerClient
+		serviceID := d.Id()
 
-	if err = d.Set("task_spec", flattenTaskSpec(service.Spec.TaskTemplate)); err != nil {
-		log.Printf("[WARN] failed to set task spec from API: %s", err)
-	}
-	if err = d.Set("mode", flattenServiceMode(service.Spec.Mode)); err != nil {
-		log.Printf("[WARN] failed to set mode from API: %s", err)
-	}
-	if err := d.Set("update_config", flattenServiceUpdateOrRollbackConfig(service.Spec.UpdateConfig)); err != nil {
-		log.Printf("[WARN] failed to set update_config from API: %s", err)
-	}
-	if err = d.Set("rollback_config", flattenServiceUpdateOrRollbackConfig(service.Spec.RollbackConfig)); err != nil {
-		log.Printf("[WARN] failed to set rollback_config from API: %s", err)
-	}
-	if err = d.Set("endpoint_spec", flattenServiceEndpointSpec(service.Endpoint)); err != nil {
-		log.Printf("[WARN] failed to set endpoint spec from API: %s", err)
-	}
+		apiService, err := fetchDockerService(serviceID, d.Get("name").(string), client)
+		if err != nil {
+			return nil, "", err
+		}
+		if apiService == nil {
+			log.Printf("[WARN] Service (%s) not found, removing from state", serviceID)
+			d.SetId("")
+			return serviceID, "removed", nil
+		}
+		service, _, err := client.ServiceInspectWithRaw(context.Background(), apiService.ID, types.ServiceInspectOptions{})
+		if err != nil {
+			return serviceID, "", fmt.Errorf("Error inspecting service %s: %s", apiService.ID, err)
+		}
 
-	return nil
+		jsonObj, _ := json.MarshalIndent(service, "", "\t")
+		log.Printf("[DEBUG] Docker service inspect: %s", jsonObj)
+
+		if service.Endpoint.Spec.Mode != service.Spec.EndpointSpec.Mode {
+			log.Printf("[DEBUG] endpoint.Spec of Service %s does not match Spec.EndpointSpec yet", serviceID)
+			return serviceID, "pending", nil
+		}
+
+		d.SetId(service.ID)
+		d.Set("name", service.Spec.Name)
+		d.Set("labels", mapToLabelSet(service.Spec.Labels))
+
+		if err = d.Set("task_spec", flattenTaskSpec(service.Spec.TaskTemplate)); err != nil {
+			log.Printf("[WARN] failed to set task spec from API: %s", err)
+		}
+		if err = d.Set("mode", flattenServiceMode(service.Spec.Mode)); err != nil {
+			log.Printf("[WARN] failed to set mode from API: %s", err)
+		}
+		if err := d.Set("update_config", flattenServiceUpdateOrRollbackConfig(service.Spec.UpdateConfig)); err != nil {
+			log.Printf("[WARN] failed to set update_config from API: %s", err)
+		}
+		if err = d.Set("rollback_config", flattenServiceUpdateOrRollbackConfig(service.Spec.RollbackConfig)); err != nil {
+			log.Printf("[WARN] failed to set rollback_config from API: %s", err)
+		}
+		if err = d.Set("endpoint_spec", flattenServiceEndpointSpec(service.Endpoint)); err != nil {
+			log.Printf("[WARN] failed to set endpoint spec from API: %s", err)
+		}
+
+		return serviceID, "all_fields", nil
+	}
 }
 
 func resourceDockerServiceUpdate(d *schema.ResourceData, meta interface{}) error {