feat(volumes): add a switch to use CIFS volumes (#3823)

* feat(volumes): add a switch to use CIFS volumes

* feat(volumes): switch between nfs and cifs

* feat(volumes): autofix sharepoint, hide driveroptions and allow to create unnammed volume

* feat(volumes): change cifs version select options

* feat(volumes): change few things

api/http/proxy/factory/docker/volumes.go

@@ -121,7 +121,7 @@ func (transport *Transport) decorateVolumeResourceCreationOperation(request *htt
 		return response, err
 	}
 
-	if response.StatusCode == http.StatusCreated && volumeID != "" {
+	if response.StatusCode == http.StatusCreated {
 		err = transport.decorateGenericResourceCreationResponse(response, resourceIdentifierAttribute, resourceType, tokenData.ID)
 	}
 	return response, err

app/docker/components/volumesCIFSForm/volumesCifsForm.html

@@ -0,0 +1,84 @@
+<!-- CIFS-settings -->
+<div ng-show="$ctrl.data.useCIFS">
+  <ng-form class="form-horizontal" name="cifsInformationForm">
+    <div class="col-sm-12 form-section-title">
+      CIFS Settings
+    </div>
+    <!-- address-input -->
+    <div class="form-group col-md-12">
+      <label for="cifs_address" class="col-sm-2 col-md-1 control-label text-left">Address</label>
+      <div class="col-sm-10 col-md-11">
+        <input type="text" class="form-control" ng-model="$ctrl.data.serverAddress" name="cifs_address" placeholder="e.g. my.cifs-server.com OR xxx.xxx.xxx.xxx" required />
+      </div>
+    </div>
+    <div class="form-group col-md-12" ng-show="cifsInformationForm.cifs_address.$invalid">
+      <div class="small text-warning">
+        <div ng-messages="cifsInformationForm.cifs_address.$error">
+          <p ng-message="required"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
+        </div>
+      </div>
+    </div>
+    <!-- !address-input -->
+    <!-- mount-point-input -->
+    <div class="form-group col-md-12">
+      <label for="cifs_share" class="col-sm-2 col-md-1 control-label text-left">Share</label>
+      <div class="col-sm-10 col-md-11">
+        <input type="text" class="form-control" ng-model="$ctrl.data.share" name="cifs_share" placeholder="e.g. /myshare" required />
+      </div>
+    </div>
+    <div class="form-group col-md-12" ng-show="cifsInformationForm.cifs_share.$invalid">
+      <div class="small text-warning">
+        <div ng-messages="cifsInformationForm.cifs_share.$error">
+          <p ng-message="required"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
+        </div>
+      </div>
+    </div>
+    <!-- !mount-point-input -->
+    <!-- version-input -->
+    <div class="form-group col-md-12">
+      <label for="cifs_version" class="col-sm-2 col-md-1 control-label text-left">CIFS Version</label>
+      <div class="col-sm-10 col-md-11">
+        <select class="form-control" ng-model="$ctrl.data.version" name="cifs_version" ng-options="version for version in $ctrl.data.versions" required></select>
+      </div>
+    </div>
+    <div class="form-group col-md-12" ng-show="cifsInformationForm.cifs_version.$invalid">
+      <div class="small text-warning">
+        <div ng-messages="cifsInformationForm.cifs_version.$error">
+          <p ng-message="required"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
+        </div>
+      </div>
+    </div>
+    <!-- !version-input -->
+    <!-- username -->
+    <div class="form-group col-md-12">
+      <label for="cifs_username" class="col-sm-2 col-md-1 control-label text-left">Username</label>
+      <div class="col-sm-10 col-md-11">
+        <input type="text" class="form-control" ng-model="$ctrl.data.username" name="cifs_username" required />
+      </div>
+    </div>
+    <div class="form-group col-md-12" ng-show="cifsInformationForm.cifs_username.$invalid">
+      <div class="small text-warning">
+        <div ng-messages="cifsInformationForm.cifs_username.$error">
+          <p ng-message="required"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
+        </div>
+      </div>
+    </div>
+    <!-- !username -->
+    <!-- password -->
+    <div class="form-group col-md-12">
+      <label for="cifs_password" class="col-sm-2 col-md-1 control-label text-left">Password</label>
+      <div class="col-sm-10 col-md-11">
+        <input type="text" class="form-control" ng-model="$ctrl.data.password" name="cifs_password" required />
+      </div>
+    </div>
+    <div class="form-group col-md-12" ng-show="cifsInformationForm.password.$invalid">
+      <div class="small text-warning">
+        <div ng-messages="cifsInformationForm.cifs_password.$error">
+          <p ng-message="required"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
+        </div>
+      </div>
+    </div>
+    <!-- !password -->
+  </ng-form>
+</div>
+<!-- !CIFS-settings -->

app/docker/components/volumesCIFSForm/volumesCifsForm.js

@@ -0,0 +1,6 @@
+angular.module('portainer.docker').component('volumesCifsForm', {
+  templateUrl: './volumesCifsForm.html',
+  bindings: {
+    data: '=',
+  },
+});

app/docker/components/volumesCIFSForm/volumesCifsFormModel.js

@@ -0,0 +1,15 @@
+export function VolumesCIFSFormData() {
+  this.useCIFS = false;
+  this.serverAddress = '';
+  this.share = '';
+  this.version = 'CIFS v2.0 (Used by Windows Vista / Server 2008)';
+  this.versions = [
+    'CIFS v1.0 (Used by Windows XP / Server 2003 and earlier)',
+    'CIFS v2.0 (Used by Windows Vista / Server 2008)',
+    'CIFS v2.1 (Used by Windows 7 / Server 2008 R2)',
+    'CIFS 3.0 (Used by Windows 8 / Server 2012 and newer)',
+  ];
+  this.versionsNumber = ['1.0', '2.0', '2.1', '3.0'];
+  this.username = '';
+  this.password = '';
+}

app/docker/components/volumesNFSForm/volumesnfsForm.html

@@ -1,16 +1,3 @@
-<div>
-  <div class="form-group col-md-12">
-    <label for="useNFS" class="control-label text-left">
-      Use NFS volume
-    </label>
-    <label class="switch" style="margin-left: 20px;">
-      <input type="checkbox" name="useNFS" ng-model="$ctrl.data.useNFS" />
-      <i></i>
-    </label>
-    <div ng-if="$ctrl.data.useNFS" class="small text-muted" style="margin-top: 10px;">
-      Ensure <code>nfs-utils</code> are installed on your hosts.
-    </div>
-  </div>
 <!-- NFS-settings -->
 <div ng-show="$ctrl.data.useNFS">
   <ng-form class="form-horizontal" name="nfsInformationForm">
@@ -83,4 +70,3 @@
   </ng-form>
 </div>
 <!-- !NFS-settings -->
-</div>

app/docker/rest/volume.js

@@ -9,7 +9,7 @@ angular.module('portainer.docker').factory('Volume', [
     'use strict';
 
     function addVolumeNameToHeader(config) {
-      return config.data.Name;
+      return config.data.Name || '';
     }
 
     return $resource(

app/docker/views/volumes/create/createVolumeController.js

@@ -1,5 +1,6 @@
 import { AccessControlFormData } from '../../../../portainer/components/accessControlForm/porAccessControlFormModel';
 import { VolumesNFSFormData } from '../../../components/volumesNFSForm/volumesNFSFormModel';
+import { VolumesCIFSFormData } from '../../../components/volumesCIFSForm/volumesCifsFormModel';
 
 angular.module('portainer.docker').controller('CreateVolumeController', [
   '$q',
@@ -19,6 +20,7 @@ angular.module('portainer.docker').controller('CreateVolumeController', [
       AccessControlData: new AccessControlFormData(),
       NodeName: null,
       NFSData: new VolumesNFSFormData(),
+      CIFSData: new VolumesCIFSFormData(),
     };
 
     $scope.state = {
@@ -48,6 +50,23 @@ angular.module('portainer.docker').controller('CreateVolumeController', [
       return true;
     }
 
+    function prepareCIFSConfiguration(driverOptions) {
+      const data = $scope.formValues.CIFSData;
+
+      driverOptions.push({ name: 'type', value: 'cifs' });
+
+      let share = data.share.replace('\\', '/');
+      if (share[0] !== '/') {
+        share = '/' + share;
+      }
+      const device = '//' + data.serverAddress + share;
+      driverOptions.push({ name: 'device', value: device });
+
+      const versionNumber = data.versionsNumber[data.versions.indexOf(data.version)];
+      const options = 'username=' + data.username + ',password=' + data.password + ',vers=' + versionNumber;
+      driverOptions.push({ name: 'o', value: options });
+    }
+
     function prepareNFSConfiguration(driverOptions) {
       var data = $scope.formValues.NFSData;
 
@@ -74,6 +93,10 @@ angular.module('portainer.docker').controller('CreateVolumeController', [
         prepareNFSConfiguration(driverOptions);
       }
 
+      if ($scope.formValues.CIFSData.useCIFS) {
+        prepareCIFSConfiguration(driverOptions);
+      }
+
       var volumeConfiguration = VolumeService.createVolumeConfiguration(name, driver, driverOptions);
       var accessControlData = $scope.formValues.AccessControlData;
       var userDetails = Authentication.getUserDetails();

app/docker/views/volumes/create/createvolume.html

@@ -31,7 +31,7 @@
           </div>
           <!-- !driver-input -->
           <!-- driver-options -->
-          <div class="form-group">
+          <div class="form-group" ng-hide="formValues.CIFSData.useCIFS || formValues.NFSData.useNFS">
             <div class="col-sm-12" style="margin-top: 5px;">
               <label class="control-label text-left">
                 Driver options
@@ -64,8 +64,35 @@
           </div>
           <!-- !driver-options -->
           <!-- nfs-management -->
+          <div class="form-group col-md-12">
+            <label for="useNFS" class="control-label text-left">
+              Use NFS volume
+            </label>
+            <label class="switch" style="margin-left: 20px;">
+              <input type="checkbox" name="useNFS" ng-model="formValues.NFSData.useNFS" ng-click="formValues.CIFSData.useCIFS = false" />
+              <i></i>
+            </label>
+            <div ng-if="formValues.NFSData.useNFS" class="small text-muted" style="margin-top: 10px;">
+              Ensure <code>nfs-utils</code> are installed on your hosts.
+            </div>
+          </div>
           <volumes-nfs-form data="formValues.NFSData" ng-show="formValues.Driver === 'local'"></volumes-nfs-form>
           <!-- !nfs-management -->
+          <!-- cifs-management -->
+          <div class="form-group col-md-12">
+            <label for="useCIFS" class="control-label text-left">
+              Use CIFS volume
+            </label>
+            <label class="switch" style="margin-left: 20px;">
+              <input type="checkbox" name="useCIFS" ng-model="formValues.CIFSData.useCIFS" ng-click="formValues.NFSData.useNFS = false" />
+              <i></i>
+            </label>
+            <div ng-if="formValues.CIFSData.useCIFS" class="small text-muted" style="margin-top: 10px;">
+              Ensure <code>cifs-utils</code> are installed on your hosts.
+            </div>
+          </div>
+          <volumes-cifs-form data="formValues.CIFSData" ng-show="formValues.Driver === 'local'"></volumes-cifs-form>
+          <!-- !cifs-management -->
           <!-- storidge -->
           <div ng-if="formValues.Driver === 'cio:latest'">
             <div class="col-sm-12 form-section-title">
@@ -95,7 +122,7 @@
                 type="button"
                 class="btn btn-primary btn-sm"
                 ng-click="create()"
-                ng-disabled="state.actionInProgress || (formValues.NFSData.useNFS && !volumeCreationForm.$valid)"
+                ng-disabled="state.actionInProgress || (formValues.NFSData.useNFS && !volumeCreationForm.nfsInformationForm.$valid) || (formValues.CIFSData.useCIFS && !volumeCreationForm.cifsInformationForm.$valid)"
                 button-spinner="state.actionInProgress"
               >
                 <span ng-hide="state.actionInProgress">Create the volume</span>