itamae 1.0.0.beta24 → 1.0.0.beta25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea6fc052b822e3cde537f8c2f7b78116d5ed5875
-  data.tar.gz: c291f27cb784245988bc80b6eb5b41afef44704f
+  metadata.gz: f605498020d0aeec34bafecc46b026c60d686034
+  data.tar.gz: 404ca611835437710e7bd838f3489fa1f9fe6385
 SHA512:
-  metadata.gz: 5e7c82107830eca10417bd2bc4c2f2e1312420fcee1852015862ab2c992939e12d282a834213b492783b1639d6472f9c1c175822b0931b7e700e05d7e2bf8104
-  data.tar.gz: 7a54dda4b3e814ec755ea74f3fee019236579ba0343cc2339a9cdbe1d64590d312bcb6f63eee0032aa76fcbef67f98a0f4b82ca07c28b4028a91f43f748c56a9
+  metadata.gz: 04a4ba33724549eb5f5bb80808bf3f0b05abe669d5c474387f69dd705b73ecb4151ad81267c2f7e5be3a1402e724780483ffa6ea65c645f991a382447e8eedc2
+  data.tar.gz: 7ca95a00ff582c363a78afbfeae79cc60f03ddb40951af7b6ab6948abf08735be08ed9331adb04c3454da5b16058d46345bc30ccf19364bb9a9d8f53dfdfd988

data/lib/itamae/resource/user.rb

@@ -11,9 +11,32 @@ module Itamae
       define_attribute :system_user, type: [TrueClass, FalseClass]
       define_attribute :uid, type: [String, Integer]
 
+      def set_current_attributes
+        @current_attributes[:exist?] = exist?
+
+        if @current_attributes[:exist?]
+          @current_attributes[:uid] = run_command(["id", "-u", username]).stdout.strip
+          @current_attributes[:gid] = run_command(["id", "-g", username]).stdout.strip
+          @current_attributes[:home] = run_command("echo ~#{shell_escape(username)}").stdout.strip
+        end
+      end
+
       def create_action
         if run_specinfra(:check_user_exists, username)
-          Logger.warn "User already exists. Currently, user resources do not support to modify attributes."
+          if uid && uid.to_s != @current_attributes[:uid]
+            run_command(["usermod", "-u", uid, username]) 
+            updated!
+          end
+
+          if gid && gid.to_s != @current_attributes[:gid]
+            run_command(["usermod", "-g", gid, username])
+            updated!
+          end
+
+          if password && password != current_password
+            run_command("echo #{shell_escape("#{username}:#{password}")} | chpasswd -e")
+            updated!
+          end
         else
           args = ["useradd"]
           args << "-g" << gid if gid
@@ -23,8 +46,19 @@ module Itamae
           args << "-u" << uid.to_s if uid
           args << username
           run_command(args)
+
+          updated!
         end
       end
+
+      private
+      def exist?
+        run_specinfra(:check_user_exists, username)
+      end
+
+      def current_password
+        run_command("cat /etc/shadow | grep -E ^itamae:").stdout.split(":")[1]
+      end
     end
   end
 end

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.0.0.beta24
+1.0.0.beta25

data/spec/integration/recipes/default.rb

@@ -1,10 +1,15 @@
 include_recipe "./included.rb"
 
-# TODO: replace with user resource
-#execute 'id itamae || useradd itamae'
+user "create itamae user" do
+  uid 123
+  username "itamae"
+  password "$1$ltOY8bZv$iZ57f1KAp8jwKViNm3pze."
+end
 
-user "itamae" do
+user "update itamae user" do
   uid 1234
+  username "itamae"
+  password "$1$TQz9gPMl$nHYrsA5W2ZdZ0Yn021BQH1"
 end
 
 ######

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta24
+  version: 1.0.0.beta25
 platform: ruby
 authors:
 - Ryota Arai