Merge branch 'master' of https://github.com/jianxiaoguo/controller

Author: lijianguo

rootfs/api/migrations/0001_initial.py

@@ -260,8 +260,8 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(max_length=63, validators=[api.models.validate_label])),
                 ('plan', models.CharField(max_length=128)),
                 ('data', jsonfield.fields.JSONField(blank=True, default={})),
-                ('status', models.CharField(max_length=32, null=True)),
-                ('binding', models.CharField(max_length=32, null=True)),
+                ('status', models.TextField(blank=True, null=True)),
+                ('binding', models.TextField(blank=True, null=True)),
                 ('options', jsonfield.fields.JSONField(blank=True, default={})),
                 ('app', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='api.App')),
                 ('owner', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL)),

rootfs/api/models/resource.py

@@ -20,8 +20,8 @@ class Resource(UuidAuditedModel):
     name = models.CharField(max_length=63, validators=[validate_label])
     plan = models.CharField(max_length=128)
     data = JSONField(default={}, blank=True)
-    status = models.CharField(max_length=32, null=True)
-    binding = models.CharField(max_length=32, null=True)
+    status = models.TextField(blank=True, null=True)
+    binding = models.TextField(blank=True, null=True)
     options = JSONField(default={}, blank=True)
 
     class Meta:

rootfs/api/views.py

@@ -665,7 +665,8 @@ def path(self, request, *args, **kwargs):
             raise DryccException("path is a required field")
         obj = self.get_object()
         container_types = [_ for _ in new_path.keys()
-                           if _ not in obj.app.procfile_structure.keys()]
+                           if _ not in obj.app.procfile_structure.keys() or
+                           _ not in obj.app.structure.keys()]
         if container_types:
             raise DryccException("process type {} is not included in profile".
                                  format(','.join(container_types)))