taste_tester 0.0.14 → 0.0.19

data/scripts/taste-untester

@@ -14,19 +14,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-CONFIG_PATH='/etc/chef'
-CONFIG_NAME='client'
-
-CONFIG_FILE="${CONFIG_FILE:-/etc/taste-untester-config}"
-if [ -e "$CONFIG_FILE" ]; then
-  source "$COFNIG_FILE"
-fi
-
+# default configs
 CONFLINK='/etc/chef/client.rb'
 PRODCONF='/etc/chef/client-prod.rb'
 CERTLINK='/etc/chef/client.pem'
 PRODCERT='/etc/chef/client-prod.pem'
 STAMPFILE='/etc/chef/test_timestamp'
+
+# let the config file overwrite them
+CONFIG_FILE="${CONFIG_FILE:-/etc/taste-untester-config}"
+if [ -e "$CONFIG_FILE" ]; then
+  source "$CONFIG_FILE"
+fi
+
 MYSELF=$0
 DRYRUN=0
 DEBUG=0

data/scripts/taste-untester.ps1

@@ -0,0 +1,85 @@
+# Copyright 2020-present Facebook
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#     http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+[CmdletBinding()]
+param(
+  [switch]$dryrun
+)
+
+# keep these as *forward* slashes
+$CONFLINK = 'C:/chef/client.rb'
+$PRODCONF = 'C:/chef/client-prod.rb'
+$CERTLINK = 'C:/chef/client.pem'
+$PRODCERT = 'C:/chef/client-prod.pem'
+$STAMPFILE = 'C:/chef/test_timestamp'
+$MYSELF = $0
+
+function log($msg) {
+  Write-EventLog -LogName "Application" -Source "taste-tester" `
+    -EventID 2 -EntryType Warning -Message $msg
+}
+
+function set_server_to_prod {
+  if (Test-Path $STAMPFILE) {
+    $content = Get-Content $STAMPFILE
+    if ($content -ne $null) {
+      kill $content -Force 2>$null
+    }
+  }
+  rm -Force $CONFLINK
+  New-Item -ItemType symboliclink -Force -Value $PRODCONF $CONFLINK
+  if (Test-Path $STAMPFILE) {
+    rm -Force $STAMPFILE
+  }
+  log "Reverted to production Chef."
+}
+
+function check_server {
+  # this is the only way to check if something is a symlink, apparently
+  if (-Not ((get-item $CONFLINK).Attributes.ToString() -match "ReparsePoint")) {
+    Write-Verbose "$CONFLINK is not a link..."
+    return
+  }
+  $current_config = (Get-Item $CONFLINK).target
+  if ($current_config -eq $PRODCONF) {
+    if (Test-Path $STAMPFILE) {
+      rm -Force $STAMPFILE
+    }
+    return
+  }
+
+  $revert = $false
+  if (-Not (Test-Path $STAMPFILE)) {
+    $revert = $true
+  } else {
+    $now = [int][double]::Parse(
+      $(Get-Date -date (Get-Date).ToUniversalTime()-uformat %s)
+    )
+    $stamp_time = Get-Date -Date `
+      (Get-Item $STAMPFILE).LastWriteTime.ToUniversalTime() -UFormat %s
+    Write-Verbose "$now vs $stamp_time"
+    if ($now -gt $stamp_time) {
+      $revert = $true
+    }
+  }
+  if ($revert) {
+    if ($dryrun) {
+      echo "DRYRUN: Would return server to prod"
+    } else {
+      set_server_to_prod
+    }
+  }
+}
+
+check_server

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: taste_tester
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.19
 platform: ruby
 authors:
 - Phil Dibowitz
 - Marcin Sawicki
 autorequire: 
-bindir: bin
+bindir:
+- bin
 cert_chain: []
-date: 2019-08-02 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: between_meals
@@ -17,30 +18,16 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.0.11
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: mixlib-config
+  name: chef
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,33 +55,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: chef-zero
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: knife-solo
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 2.0.0
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -110,19 +83,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.1
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: mixlib-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.49.1
+        version: '0'
 description: Utility for testing Chef changes using chef-zero
 email: 
 executables:
@@ -146,13 +119,15 @@ files:
 - lib/taste_tester/noop.rb
 - lib/taste_tester/server.rb
 - lib/taste_tester/ssh.rb
+- lib/taste_tester/ssh_util.rb
 - lib/taste_tester/state.rb
 - lib/taste_tester/tunnel.rb
 - lib/taste_tester/windows.rb
 - scripts/taste-untester
+- scripts/taste-untester.ps1
 homepage: https://github.com/facebook/taste-tester
 licenses:
-- Apache
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -169,8 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Taste Tester