mirror/stackexchange-dnscontrol
1
0
Fork 0
mirror of https://github.com/StackExchange/dnscontrol.git synced 2024-05-11 05:55:12 +00:00
Code Issues Releases Activity

Refactor to use better cli command framework (#177)

Browse Source 
* starting to refactor commands

* work

* not sure

* all commands working!

* actually add file

* work in delay flag again

* start to refactor out console printing

* i hate line endings

* simple travis test to find direct output

* remove all direct printing from push/preview

* checkin vendor

* don't need this yet

* forgot to commit these

* make version explicit command

* some code review

* Add "check" subcommand.

* move stuff to commands package

* fix

* comment out check for printlns. for now

* alphabet hax

* activedir flags gone. use creds instead

* active dir doc update

* remove bind specific flags. creds instead

* default to zones dir

* fix linux build

* fix test

* cleanup random global* vars

* Clean up PowerShell docs

* rename dump-ir to print-ir. combine with print-js
This commit is contained in:
Craig Peterson
2017-09-13 10:00:41 -04:00
committed by GitHub
parent e7006f3767
commit 1d9d2b1a19
33 changed files with 6188 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
providers/activedir/getzones_windows.go
View File

@@ -16,9 +16,9 @@ func (c *adProvider) getRecords(domainname string) ([]byte, error) {
// If we are using PowerShell, make sure it is enabled
// and then run the PS1 command to generate the adzonedump file.
if !*flagFakePowerShell {
if !c.fake {
checkPS.Do(func() {
psAvailible = isPowerShellReady()
psAvailible = c.isPowerShellReady()
if !psAvailible {
fmt.Printf("\n\n\n")
fmt.Printf("***********************************************\n")
@@ -32,7 +32,7 @@ func (c *adProvider) getRecords(domainname string) ([]byte, error) {
return nil, fmt.Errorf("powershell module DnsServer not installed")
}
_, err := powerShellExec(c.generatePowerShellZoneDump(domainname), true)
_, err := c.powerShellExec(c.generatePowerShellZoneDump(domainname), true)
if err != nil {
return []byte{}, err
}
@@ -41,8 +41,8 @@ func (c *adProvider) getRecords(domainname string) ([]byte, error) {
return c.readZoneDump(domainname)
}
func isPowerShellReady() bool {
query, _ := powerShellExec(`(Get-Module -ListAvailable DnsServer) -ne $null`, true)
func (c *adProvider) isPowerShellReady() bool {
query, _ := c.powerShellExec(`(Get-Module -ListAvailable DnsServer) -ne $null`, true)
q, err := strconv.ParseBool(strings.TrimSpace(string(query)))
if err != nil {
return false
@@ -50,18 +50,18 @@ func isPowerShellReady() bool {
return q
}
func powerShellDoCommand(command string, shouldLog bool) error {
if *flagFakePowerShell {
func (c *adProvider) powerShellDoCommand(command string, shouldLog bool) error {
if c.fake {
// If fake, just record the command.
return powerShellRecord(command)
return c.powerShellRecord(command)
}
_, err := powerShellExec(command, shouldLog)
_, err := c.powerShellExec(command, shouldLog)
return err
}
func powerShellExec(command string, shouldLog bool) ([]byte, error) {
func (c *adProvider) powerShellExec(command string, shouldLog bool) ([]byte, error) {
// log it.
err := logCommand(command)
err := c.logCommand(command)
if err != nil {
return nil, err
}
@@ -70,10 +70,10 @@ func powerShellExec(command string, shouldLog bool) ([]byte, error) {
out, err := exec.Command("powershell", "-NoProfile", command).CombinedOutput()
if err != nil {
// If there was an error, log it.
logErr(err)
c.logErr(err)
}
if shouldLog {
err = logOutput(string(out))
err = c.logOutput(string(out))
if err != nil {
return []byte{}, err
}