|
9 | 9 | "runtime" |
10 | 10 |
|
11 | 11 | "github.com/go-ole/go-ole" |
12 | | - "github.com/go-ole/go-ole/oleutil" |
13 | 12 | "github.com/microsoft/wmi/pkg/base/query" |
14 | 13 | wmierrors "github.com/microsoft/wmi/pkg/errors" |
15 | 14 | cim "github.com/microsoft/wmi/pkg/wmiinstance" |
@@ -91,105 +90,6 @@ func QueryInstances(namespace string, query *query.WmiQuery) ([]*cim.WmiInstance |
91 | 90 | return instances, err |
92 | 91 | } |
93 | 92 |
|
94 | | -// TODO: fix the panic in microsoft/wmi library and remove this workaround |
95 | | -// Refer to https://github.com/microsoft/wmi/issues/167 |
96 | | -func executeClassMethodParam(classInst *cim.WmiInstance, method *cim.WmiMethod, inParam, outParam cim.WmiMethodParamCollection) (result *cim.WmiMethodResult, err error) { |
97 | | - klog.V(6).Infof("[WMI] - Executing Method [%s]\n", method.Name) |
98 | | - |
99 | | - iDispatchInstance := classInst.GetIDispatch() |
100 | | - if iDispatchInstance == nil { |
101 | | - return nil, wmierrors.Wrapf(wmierrors.InvalidInput, "InvalidInstance") |
102 | | - } |
103 | | - rawResult, err := iDispatchInstance.GetProperty("Methods_") |
104 | | - if err != nil { |
105 | | - return nil, err |
106 | | - } |
107 | | - defer rawResult.Clear() |
108 | | - // Retrieve the method |
109 | | - rawMethod, err := rawResult.ToIDispatch().CallMethod("Item", method.Name) |
110 | | - if err != nil { |
111 | | - return nil, err |
112 | | - } |
113 | | - defer rawMethod.Clear() |
114 | | - |
115 | | - addInParam := func(inparamVariant *ole.VARIANT, paramName string, paramValue interface{}) error { |
116 | | - rawProperties, err := inparamVariant.ToIDispatch().GetProperty("Properties_") |
117 | | - if err != nil { |
118 | | - return err |
119 | | - } |
120 | | - defer rawProperties.Clear() |
121 | | - rawProperty, err := rawProperties.ToIDispatch().CallMethod("Item", paramName) |
122 | | - if err != nil { |
123 | | - return err |
124 | | - } |
125 | | - defer rawProperty.Clear() |
126 | | - |
127 | | - p, err := rawProperty.ToIDispatch().PutProperty("Value", paramValue) |
128 | | - if err != nil { |
129 | | - return err |
130 | | - } |
131 | | - defer p.Clear() |
132 | | - return nil |
133 | | - } |
134 | | - |
135 | | - params := []interface{}{method.Name} |
136 | | - if len(inParam) > 0 { |
137 | | - inparamsRaw, err := rawMethod.ToIDispatch().GetProperty("InParameters") |
138 | | - if err != nil { |
139 | | - return nil, err |
140 | | - } |
141 | | - defer inparamsRaw.Clear() |
142 | | - |
143 | | - inparams, err := oleutil.CallMethod(inparamsRaw.ToIDispatch(), "SpawnInstance_") |
144 | | - if err != nil { |
145 | | - return nil, err |
146 | | - } |
147 | | - defer inparams.Clear() |
148 | | - |
149 | | - for _, inp := range inParam { |
150 | | - addInParam(inparams, inp.Name, inp.Value) |
151 | | - } |
152 | | - |
153 | | - params = append(params, inparams) |
154 | | - } |
155 | | - |
156 | | - result = &cim.WmiMethodResult{ |
157 | | - OutMethodParams: map[string]*cim.WmiMethodParam{}, |
158 | | - } |
159 | | - outparams, err := classInst.GetIDispatch().CallMethod("ExecMethod_", params...) |
160 | | - if err != nil { |
161 | | - return |
162 | | - } |
163 | | - defer outparams.Clear() |
164 | | - returnRaw, err := outparams.ToIDispatch().GetProperty("ReturnValue") |
165 | | - if err != nil { |
166 | | - return |
167 | | - } |
168 | | - defer returnRaw.Clear() |
169 | | - if returnRaw.Value() != nil { |
170 | | - result.ReturnValue = returnRaw.Value().(int32) |
171 | | - klog.V(6).Infof("[WMI] - Return [%d] ", result.ReturnValue) |
172 | | - } |
173 | | - |
174 | | - for _, outp := range outParam { |
175 | | - returnRawIn, err1 := outparams.ToIDispatch().GetProperty(outp.Name) |
176 | | - if err1 != nil { |
177 | | - err = err1 |
178 | | - return |
179 | | - } |
180 | | - defer returnRawIn.Clear() |
181 | | - |
182 | | - value, err1 := cim.GetVariantValue(returnRawIn) |
183 | | - if err1 != nil { |
184 | | - err = err1 |
185 | | - return |
186 | | - } |
187 | | - |
188 | | - result.OutMethodParams[outp.Name] = cim.NewWmiMethodParam(outp.Name, value) |
189 | | - } |
190 | | - return |
191 | | -} |
192 | | - |
193 | 93 | // InvokeCimMethod calls a static method on a specific WMI class with given input parameters, |
194 | 94 | // returning the method's return value, output parameters, and any error encountered. |
195 | 95 | func InvokeCimMethod(namespace, class, methodName string, inputParameters map[string]interface{}) (int, map[string]interface{}, error) { |
@@ -225,7 +125,7 @@ func InvokeCimMethod(namespace, class, methodName string, inputParameters map[st |
225 | 125 |
|
226 | 126 | var outParam cim.WmiMethodParamCollection |
227 | 127 | var result *cim.WmiMethodResult |
228 | | - result, err = executeClassMethodParam(classInst, method, inParam, outParam) |
| 128 | + result, err = method.Execute(inParam, outParam) |
229 | 129 | if err != nil { |
230 | 130 | return -1, nil, err |
231 | 131 | } |
|
0 commit comments