vagrant-uplift 0.2.1902.32 → 0.2.1902.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49ebda5535fdce1533d6678488309234413d6b02da26ca01f72c5ef22bd6cc14
-  data.tar.gz: dbc429be596eba7ea13524837359c8bfe86e4a745ff32298ae92b4efb4ff8e7f
+  metadata.gz: c0fa955ff16956c38662aacbabd394f8ee62b7566d64b9dc804f4b69d8bd68c1
+  data.tar.gz: 7771c3b4fe9ac762c9b970d170ce99576181036bbbfa6246d8dbbd167ce568b8
 SHA512:
-  metadata.gz: 71f9831fb8d7a97aae0c091d7a94a15041c7212acbe6e149d272b61c74760c26e7b4e9549071fb4fbc2a09936f0eb593a7438c9c91104076d77397e0e64a58c5
-  data.tar.gz: ae735a1c7e239762b7cc74b0b5be7cc10e0ffbf6f21a72316af197ef1ab99be29af998d5af87f1a3dac86fa30812a3e291afa1dade1c48d8f7d0b211ea4faa7d
+  metadata.gz: a3964129501c7684e4df8ec9fd362c294d47b9afe0932fd0e5039750ae8fb0a80e546036c8f2487ef3eff298a6f0680c10ffb7be7ff967dedc51cbb5df39382f
+  data.tar.gz: a6e85ea682cc717b0a85ffd882f9b1687e810f81a524288fbb1e918dbcb33291c0f8319ef7a8f7d0039d46a876b2d1f0912f77e1ff26f075eef96aa180ae9264

data/lib/scripts/vagrant/uplift.vagrant.bootstrap/uplift.bootstrap.choco-packages.ps1

@@ -0,0 +1,40 @@
+# fail on errors and include uplift helpers
+$ErrorActionPreference = "Stop"
+
+Import-Module Uplift.Core
+
+Write-UpliftMessage "Installing Chocolatey packages..."
+Write-UpliftEnv
+
+$packages = @(
+    # using for unpacking ISO and zip archives
+    @{ Id = "7zip"; Version = "" }
+
+    # dev basics!
+    @{ Id = "git"; Version = "" }
+
+    # using for better file download experience
+    # PowerShell can't handle huge files over seevral Gb
+    @{ Id = "wget"; Version = "" }
+    @{ Id = "curl"; Version = "" }
+
+    # modern PowerShell experience
+    @{ Id = "pwsh"; Version = "" }
+)
+
+Write-UpliftMessage "Installing packages: $packages"
+
+foreach($package in $packages ) {
+
+    Write-UpliftMessage "`tinstalling package: $($package['Id']) $($package['Version'])"
+
+    if ([System.String]::IsNullOrEmpty($package["Version"]) -eq $true) {
+        choco install -y $package["Id"] --limit-output --acceptlicense --no-progress
+    } else {
+        choco install -y $package["Id"] --version $package["Version"] --limit-output --acceptlicense --no-progress
+    }
+
+    Confirm-UpliftExitCode $LASTEXITCODE "Cannot install package: $($package['Id']) $($package['Version'])"
+}
+
+exit 0

data/lib/scripts/vagrant/uplift.vagrant.bootstrap/uplift.bootstrap.choco.ps1

@@ -0,0 +1,40 @@
+# fail on errors and include uplift helpers
+$ErrorActionPreference = "Stop"
+
+Import-Module Uplift.Core
+
+Write-UpliftMessage "Installing 7z and PowerShell software..."
+Write-UpliftEnv
+
+function Set-UpliftChocolateyBootstrap() {
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingInvokeExpression", "", Scope="Function")]
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSShouldProcess", "", Scope="Function")]
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseShouldProcessForStateChangingFunctions", "", Scope="Function")]
+
+    param(
+
+    )
+
+    Write-UpliftMessage "Set-ExecutionPolicy Bypass -Force"
+    Set-ExecutionPolicy Bypass -Force;
+
+    Write-UpliftMessage "Installing chocolatey..."
+    Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'));
+    Confirm-UpliftExitCode $LASTEXITCODE "Cannot install chocolatey"
+
+    Write-UpliftMessage "choco install -y 7zip..."
+    choco install -y 7zip --limit-output --acceptlicense --no-progress;
+    Confirm-UpliftExitCode $LASTEXITCODE "Cannot install 7zip"
+
+    if($psversiontable.PSVersion.Major -ne 5) {
+        Write-UpliftMessage "Major version of POwerShell below 5. Installing PowerShell, and a reboot is required"
+        choco install -y powershell --limit-output --acceptlicense --no-progress;
+        Confirm-UpliftExitCode $LASTEXITCODE "Cannot install powershell" @(0, 3010)
+
+        $LASTEXITCODE = 0;
+    }
+}
+
+Set-UpliftChocolateyBootstrap
+
+exit 0;

data/lib/scripts/vagrant/uplift.vagrant.bootstrap/uplift.bootstrap.ps-modules.ps1

@@ -0,0 +1,106 @@
+# fail on errors and include uplift helpers
+$ErrorActionPreference = "Stop"
+
+Import-Module Uplift.Core
+
+Write-UpliftMessage "Installing PowerShell Modules..."
+Write-UpliftEnv
+
+# - install other DSC packages
+$packages = @(
+
+    @{
+        Id = "PSWindowsUpdate";
+        Version = "2.0.0.4"
+    },
+
+    @{
+        Id = "Pester";
+        Version = "4.3.1"
+    },
+
+    @{
+        Id = "cChoco";
+        Version = "2.3.1.0"
+    },
+
+    @{
+        Id = "cFirewall";
+        Version = "1.0.1"
+    },
+
+    @{
+        Id = "SharePointDSC";
+        Version = "1.9.0.0"
+    },
+
+    @{
+        Id = "MS_xVisualStudio";
+        Version = "1.0.0.0"
+    },
+
+    @{
+        Id = "xActiveDirectory";
+        Version = "2.17.0.0"
+    },
+
+    @{
+        Id = "xSQLServer";
+        Version = "9.1.0.0"
+    },
+
+    @{
+        Id = "xDSCFirewall";
+        Version = "1.6.21"
+    },
+
+    @{
+        Id = "xNetworking";
+        Version = "5.5.0.0"
+    },
+
+    @{
+        Id = "xTimeZone";
+        Version = "1.7.0.0"
+    },
+
+    @{
+        Id = "xWebAdministration";
+        Version = "1.19.0.0"
+    },
+
+    @{
+        Id = "xPendingReboot";
+        Version = "0.3.0.0"
+    },
+
+    @{
+        Id = "xComputerManagement";
+        Version = "4.0.0.0"
+    },
+
+    @{
+        Id = "DSCR_Shortcut";
+        Version = "1.3.7"
+    },
+
+    @{
+        Id = "ComputerManagementDsc";
+        Version = "6.1.0.0"
+    },
+
+    @{
+        Id = "xSystemSecurity";
+        Version = "1.4.0.0"
+    },
+
+    @{
+        Id = "xCredSSP";
+        Version = "1.3.0.0"
+    }
+)
+
+Write-UpliftMessage "Installing DSC modules: $packages"
+Install-UpliftPSModules $packages
+
+exit 0

data/lib/scripts/vagrant/uplift.vagrant.bootstrap/uplift.bootstrap.ps1

@@ -0,0 +1,153 @@
+# fail on errors and include uplift helpers
+$ErrorActionPreference = "Stop"
+
+# core script to bootstrap uplift modiles
+
+function Set-UpliftBootstrap() {
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSShouldProcess", "", Scope = "Function")]
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseShouldProcessForStateChangingFunctions", "", Scope = "Function")]
+    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingWriteHost", "", Scope = "Function")]
+
+    param(
+
+    )
+
+    function Install-LatestPSModule() {
+        [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSShouldProcess", "", Scope = "Function")]
+        [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseShouldProcessForStateChangingFunctions", "", Scope = "Function")]
+        [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingWriteHost", "", Scope = "Function")]
+
+        param(
+            $moduleName,
+            $version,
+            $repository
+        )
+
+        if( [String]::IsNullOrEmpty($version) -eq $True) {
+            $version = $null
+        }
+
+        Write-Host "Installing module: $moduleName version: $version"
+
+        Write-Host "Looking for the latest module $moduleName"
+        $moduleDefinition = Find-Module -Name $moduleName `
+            | Select-Object Version, Repository `
+            | Sort-Object Version -Descending `
+            | Select-Object -First 1
+
+        Write-Host "Found module:"
+        Write-Host $moduleDefinition
+        Write-Host " - version   : $($moduleDefinition.Version)"
+        Write-Host " - repository: $($moduleDefinition.Repository)"
+
+        if ($null -eq $version) {
+
+            if($null -eq $moduleDefinition) {
+                throw "Failed to install module $moduleName - repo/version were not provided, and cannot find latest in any repo!"
+            }
+
+            $version = $moduleDefinition.Version
+
+            if($null -eq $repository) {
+                $repository = $moduleDefinition.Repository
+            }
+
+            Write-Host "Installing latest ($version) from repo: $repository"
+            Install-Package $moduleName -Source $repository -RequiredVersion $version -Force
+        }
+        else {
+            if($null -eq $repository) {
+                $repository = $moduleDefinition.Repository
+            }
+
+            Write-Host "Installing specified version $version from repo: $repository"
+            Install-Package $moduleName -Source $repository -Force  -RequiredVersion $version
+        }
+
+        Write-Host "Checking installed module: $moduleName"
+        $installeModule = Get-InstalledModule $moduleName
+
+        if ($null -eq $installeModule) {
+            throw "Cannot find installed module: $moduleName"
+        }
+        else {
+            Write-Host "All good! Installed module:"
+
+            Write-Host " - name   : $($installeModule.Name)"
+            Write-Host " - version: $($installeModule.Version)"
+        }
+    }
+
+    function New-UpliftPSRepositoryRegistration {
+        [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSShouldProcess", "", Scope = "Function")]
+        [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSUseShouldProcessForStateChangingFunctions", "", Scope = "Function")]
+        [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingWriteHost", "", Scope = "Function")]
+
+        param(
+            $name,
+            $source,
+            $providerublish = $null,
+            $installPolicy = "Trusted"
+        )
+
+        $repo = Get-PSRepository `
+            -Name $name `
+            -ErrorAction SilentlyContinue
+
+        if ($null -eq $repo) {
+            Write-Host " [~] Regestering repo: $name"
+            Write-Host " - path: $source"
+            Write-Host " - installPolicy: $installPolicy"
+
+            if ($null -eq $providerublish) {
+                Write-Host " - publish location: $source"
+
+                Register-PSRepository -Name $name `
+                    -SourceLocation $source `
+                    -PublishLocation $source `
+                    -InstallationPolicy $installPolicy
+            }
+            else {
+                Write-Host " - publish location: $source"
+
+                Register-PSRepository -Name $name `
+                    -SourceLocation $source `
+                    -PublishLocation $providerublish `
+                    -InstallationPolicy $installPolicy
+            }
+
+        }
+        else {
+            Write-Host "Repo exists: $name"
+        }
+    }
+
+    Write-Host "Bootstrapping uplift modules..."
+    $provider = Get-PackageProvider -ListAvailable
+
+    Write-Host "Available providers: $provider"
+
+    if ($null -eq ($provider | Where-Object { $_.Name.Contains("NuGet") -eq $true } ) ) {
+        Write-Host "Installing Nuget Package provider..."
+        Install-PackageProvider -Name NuGet -MinimumVersion 2.8.5.201 -Force
+
+        Write-Host "Updating PSGallery as Trusted"
+        Set-PSRepository -Name PSGallery -InstallationPolicy Trusted
+    }
+    else {
+        Write-Host "No update required."
+    }
+
+    Write-Host "Adding PSGallery: subpointsolutions-staging"
+    New-UpliftPSRepositoryRegistration 'subpointsolutions-staging'  `
+        'https://www.myget.org/F/subpointsolutions-staging/api/v2'
+
+    Install-LatestPSModule `
+        "Uplift.Core" `
+        ($env:UPLF_UPLIFT_CORE_MODULE_VERSION) `
+        ($env:UPLF_UPLIFT_CORE_MODULE_REPOSITORY)
+}
+
+Set-UpliftBootstrap
+
+exit 0

data/lib/scripts/vagrant/uplift.vagrant.bootstrap/uplift.resource.bootstrap.ps1

@@ -0,0 +1,16 @@
+# fail on errors and include uplift helpers
+$ErrorActionPreference = "Stop"
+
+Import-Module Uplift.Core
+
+Write-UpliftMessage "Installing PowerShell Modules..."
+Write-UpliftEnv
+
+# - install invoke uplift module under pwsh
+# we need this so that pwsh would see installed module
+Write-UpliftMessage "Installing Invoke-Uplift PS6 module"
+
+Install-UpliftPS6Module `
+    "InvokeUplift" `
+    (Get-UpliftEnvVariable "UPLF_INVOKE_UPLIFT_MODULE_VERSION"    "" "") `
+    (Get-UpliftEnvVariable "UPLF_INVOKE_UPLIFT_MODULE_REPOSITORY" "" "")

data/lib/scripts/vagrant/uplift.vagrant.dc12/dc.dsc.ps1

@@ -1,4 +1,4 @@
-# fail on errors and include uplift helpers
+# fail on errors and include uplift helpers
 $ErrorActionPreference = "Stop"
 
 Import-Module Uplift.Core
@@ -23,9 +23,9 @@ Set-UpliftDCPromoSettings $domainAdminPassword
 Configuration Install_DomainController {
 
     Import-DscResource -ModuleName 'PSDesiredStateConfiguration'
-    Import-DscResource -ModuleName 'xActiveDirectory' -ModuleVersion "2.17.0.0" 
-    Import-DscResource -ModuleName 'xNetworking' -ModuleVersion "5.5.0.0" 
-    
+    Import-DscResource -ModuleName 'xActiveDirectory' -ModuleVersion "2.17.0.0"
+    Import-DscResource -ModuleName 'xNetworking' -ModuleVersion "5.5.0.0"
+
     Node localhost
     {
         $domainName           = $Node.DomainName
@@ -34,7 +34,7 @@ Configuration Install_DomainController {
 
         $securePassword   = ConvertTo-SecureString $domainAdminPassword -AsPlainText -Force
         $domainAdminCreds = New-Object System.Management.Automation.PSCredential(
-            $domainAdminName, 
+            $domainAdminName,
             $securePassword
         )
 
@@ -86,18 +86,18 @@ Configuration Install_DomainController {
             # Windows 2016 fix
             # http://vcloud-lab.com/entries/active-directory/powershell-dsc-xactivedirectory-error-a-netbios-domain-name-must-be-specified-
             DomainNetBIOSName = $domainName.Split('.')[0]
-            
+
             DomainAdministratorCredential = $domainAdminCreds
             SafemodeAdministratorPassword = $safeModeAdminCreds
-            
+
             DatabasePath = "C:\NTDS"
             LogPath      = "C:\NTDS"
             SysvolPath   = "C:\SYSVOL"
-            
+
             DependsOn = @(
-                "[WindowsFeature]ADDSInstall", 
-                "[WindowsFeature]RSAT", 
-                "[WindowsFeature]ADDSRSAT", 
+                "[WindowsFeature]ADDSInstall",
+                "[WindowsFeature]RSAT",
+                "[WindowsFeature]ADDSRSAT",
                 "[xDnsServerAddress]DnsServerAddress"
             )
         }
@@ -111,8 +111,8 @@ $config = @{
 
             PSDscAllowDomainUser        = $true
             PSDscAllowPlainTextPassword = $true
-            
-            RetryCount       = 10           
+
+            RetryCount       = 10
             RetryIntervalSec = 30
 
             DomainName           = $domainName
@@ -123,6 +123,6 @@ $config = @{
 }
 
 $configuration = Get-Command Install_DomainController
-Start-UpliftDSCConfiguration $configuration $config 
+Start-UpliftDSCConfiguration $configuration $config
 
 exit 0

data/lib/scripts/vagrant/uplift.vagrant.dc12/dc.replica.dsc.ps1

@@ -1,4 +1,4 @@
-# fail on errors and include uplift helpers
+# fail on errors and include uplift helpers
 $ErrorActionPreference = "Stop"
 
 Import-Module Uplift.Core
@@ -21,7 +21,7 @@ Configuration Install_ReplicaDomainController {
 
     Import-DscResource -ModuleName xActiveDirectory -ModuleVersion 2.17.0.0
     Import-DscResource -ModuleName xNetworking -ModuleVersion 5.5.0.0
-    
+
     Node localhost
     {
         $domainName = $Node.DomainName
@@ -29,7 +29,7 @@ Configuration Install_ReplicaDomainController {
         $domainAdminPassword = $Node.DomainAdminPassword
 
         $securePassword = ConvertTo-SecureString $domainAdminPassword -AsPlainText -Force
-        
+
         $domainAdminCreds = New-Object System.Management.Automation.PSCredential($domainAdminName, $securePassword)
         $safeModeAdminCreds = $domainAdminCreds
         $dnsDelegationCreds = $domainAdminCreds
@@ -79,13 +79,13 @@ Configuration Install_ReplicaDomainController {
             # win16 fix
             # http://vcloud-lab.com/entries/active-directory/powershell-dsc-xactivedirectory-error-a-netbios-domain-name-must-be-specified-
             # DomainNetBIOSName = $domainName.Split('.')[0]
-            
+
             DomainAdministratorCredential = $domainAdminCreds
             SafemodeAdministratorPassword = $safeModeAdminCreds
-            
+
             DependsOn = @(
-                "[WindowsFeature]ADDSInstall" 
-                # "[WindowsFeature]RSAT", 
+                "[WindowsFeature]ADDSInstall"
+                # "[WindowsFeature]RSAT",
                 # "[WindowsFeature]ADDSRSAT",
                 #"[xDnsServerAddress]DnsServerAddress"
             )
@@ -100,8 +100,8 @@ $config = @{
 
             PSDscAllowDomainUser        = $true
             PSDscAllowPlainTextPassword = $true
-            
-            RetryCount       = 10           
+
+            RetryCount       = 10
             RetryIntervalSec = 30
 
             DomainName           = $domainName
@@ -112,6 +112,6 @@ $config = @{
 }
 
 $configuration = Get-Command Install_ReplicaDomainController
-Start-UpliftDSCConfiguration $configuration $config 
+Start-UpliftDSCConfiguration $configuration $config
 
 exit 0

data/lib/vagrant-uplift/config_builder.rb

@@ -476,6 +476,12 @@ module VagrantPlugins
 
         vm_config.winrm.username = "vagrant"
         vm_config.winrm.password = "vagrant"
+
+        # HTTPClient::KeepAliveDisconnected: An existing connection was forcibly closed by the remote host #6430
+        # https://github.com/hashicorp/vagrant/issues/6430
+        # https://github.com/hashicorp/vagrant/issues/8323
+        vm_config.winrm.retry_limit = 30
+        vm_config.winrm.retry_delay = 10
       end
 
       # Disables default synced_folder for vagrant box
@@ -1135,6 +1141,47 @@ module VagrantPlugins
         })
       end
 
+      # Provisions box with the minimal oconfiguration to enable uplift
+      # That allows uplift usage on custom vagrant boxes
+      # - installs uplift.core ps module
+      # - installs various dsc modules
+      #
+      # @param vm_name [String] vagrant vm name
+      # @param vm_config [Vagrant::Config::V2::Root] vagrant vm config
+      def provision_uplift_bootstrap(vm_name, vm_config) 
+
+        require_string(vm_name)
+        require_vagrant_config(vm_config)
+
+        log_info_light("#{vm_name}: Uplift bootstrap")
+
+        vm_config.vm.provision "shell",
+            name: 'uplift.bootstrap',
+            path: "#{vagrant_script_path}/vagrant/uplift.vagrant.bootstrap/uplift.bootstrap.ps1"
+
+        vm_config.vm.provision "shell",
+            name: 'uplift.choco',
+            path: "#{vagrant_script_path}/vagrant/uplift.vagrant.bootstrap/uplift.bootstrap.choco.ps1"
+
+        vm_config.vm.provision "shell",
+            name: 'uplift.choco-packages',
+            path: "#{vagrant_script_path}/vagrant/uplift.vagrant.bootstrap/uplift.bootstrap.choco-packages.ps1"            
+
+        vm_config.vm.provision "shell",
+            name: 'uplift.dsc.bootstrap',
+            path: "#{vagrant_script_path}/vagrant/uplift.vagrant.bootstrap/uplift.bootstrap.ps-modules.ps1"            
+               
+        vm_config.vm.provision "shell",
+            name: 'uplift.resource-modul',
+            path: "#{vagrant_script_path}/vagrant/uplift.vagrant.bootstrap/uplift.resource.bootstrap.ps1"                        
+            
+
+        _track_ai_event(__method__, {
+          'vm_name': vm_name
+        })
+
+      end
+
       private
 
       def _logger 

data/lib/vagrant-uplift/version.rb

@@ -4,7 +4,7 @@ require 'fileutils'
 module VagrantPlugins
   
   module Uplift
-    VERSION = "0.2.1902.32"
+    VERSION = "0.2.1902.37"
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-uplift
 version: !ruby/object:Gem::Version
-  version: 0.2.1902.32
+  version: 0.2.1902.37
 platform: ruby
 authors:
 - SubPointSupport
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-08 00:00:00.000000000 Z
+date: 2019-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -62,6 +62,11 @@ extra_rdoc_files: []
 files:
 - bin/console
 - bin/setup
+- lib/scripts/vagrant/uplift.vagrant.bootstrap/uplift.bootstrap.choco-packages.ps1
+- lib/scripts/vagrant/uplift.vagrant.bootstrap/uplift.bootstrap.choco.ps1
+- lib/scripts/vagrant/uplift.vagrant.bootstrap/uplift.bootstrap.ps-modules.ps1
+- lib/scripts/vagrant/uplift.vagrant.bootstrap/uplift.bootstrap.ps1
+- lib/scripts/vagrant/uplift.vagrant.bootstrap/uplift.resource.bootstrap.ps1
 - lib/scripts/vagrant/uplift.vagrant.core/uplift.fix-second-network.ps1
 - lib/scripts/vagrant/uplift.vagrant.dc12/dc.dsc.ps1
 - lib/scripts/vagrant/uplift.vagrant.dc12/dc.replica.dsc.ps1